wez Mon Sep 19 20:46:03 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_odbc pdo_odbc.c
/php-src/ext/pdo_odbc/tests long_columns.phpt
Log:
MFH: use PDO:: class constants
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/pdo_odbc.c?r1=1.14.2.1&r2=1.14.2.2&ty=u
Index: php-src/ext/pdo_odbc/pdo_odbc.c
diff -u php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.1
php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.2
--- php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.1 Sun Sep 11 01:27:30 2005
+++ php-src/ext/pdo_odbc/pdo_odbc.c Mon Sep 19 20:46:02 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_odbc.c,v 1.14.2.1 2005/09/11 05:27:30 wez Exp $ */
+/* $Id: pdo_odbc.c,v 1.14.2.2 2005/09/20 00:46:02 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -112,10 +112,10 @@
}
#endif
- REGISTER_LONG_CONSTANT("PDO_ODBC_ATTR_USE_CURSOR_LIBRARY",
PDO_ODBC_ATTR_USE_CURSOR_LIBRARY, CONST_CS|CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("PDO_ODBC_SQL_USE_IF_NEEDED",
SQL_CUR_USE_IF_NEEDED, CONST_CS|CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("PDO_ODBC_SQL_USE_DRIVER", SQL_CUR_USE_DRIVER,
CONST_CS|CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("PDO_ODBC_SQL_USE_ODBC", SQL_CUR_USE_ODBC,
CONST_CS|CONST_PERSISTENT);
+ REGISTER_PDO_CONST_LONG("ODBC_ATTR_USE_CURSOR_LIBRARY",
PDO_ODBC_ATTR_USE_CURSOR_LIBRARY);
+ REGISTER_PDO_CONST_LONG("ODBC_SQL_USE_IF_NEEDED",
SQL_CUR_USE_IF_NEEDED);
+ REGISTER_PDO_CONST_LONG("ODBC_SQL_USE_DRIVER", SQL_CUR_USE_DRIVER);
+ REGISTER_PDO_CONST_LONG("ODBC_SQL_USE_ODBC", SQL_CUR_USE_ODBC);
return SUCCESS;
}
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/tests/long_columns.phpt?r1=1.2&r2=1.2.2.1&ty=u
Index: php-src/ext/pdo_odbc/tests/long_columns.phpt
diff -u php-src/ext/pdo_odbc/tests/long_columns.phpt:1.2
php-src/ext/pdo_odbc/tests/long_columns.phpt:1.2.2.1
--- php-src/ext/pdo_odbc/tests/long_columns.phpt:1.2 Tue Jul 19 12:55:48 2005
+++ php-src/ext/pdo_odbc/tests/long_columns.phpt Mon Sep 19 20:46:02 2005
@@ -8,7 +8,7 @@
<?php
require 'ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory('ext/pdo_odbc/tests/common.phpt');
-$db->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_SILENT);
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
if (false === $db->exec('CREATE TABLE TEST (id INT NOT NULL PRIMARY KEY, data
CLOB)')) {
if (false === $db->exec('CREATE TABLE TEST (id INT NOT NULL PRIMARY
KEY, data longtext)')) {
@@ -16,7 +16,7 @@
}
}
-$db->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_EXCEPTION);
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$sizes = array(32, 64, 128, 253, 254, 255, 256, 257, 258, 512, 1024, 2048,
3998, 3999, 4000);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
