cvs: pecl /pdo pdo_dbh.c pdo_stmt.c php_pdo_driver.h /pdo/tests bug_36428.phpt

helly Fri Feb 24 16:04:14 2006 UTC Modified files: /pecl/pdo pdo_dbh.c pdo_stmt.c php_pdo_driver.h /pecl/pdo/tests bug_36428.phpt Log: - s/FETCH_PROPSLATE/FETCH_PROPS_LATE/ as per IRC discussion http://cvs.php.net/viewcvs.cgi/pecl/pdo/pdo_dbh.c?r1=1.114&r2=1.115&diff_format=u Index: pecl/pdo/pdo_dbh.c diff -u pecl/pdo/pdo_dbh.c:1.114 pecl/pdo/pdo_dbh.c:1.115 --- pecl/pdo/pdo_dbh.c:1.114 Fri Feb 24 15:56:03 2006 +++ pecl/pdo/pdo_dbh.c Fri Feb 24 16:04:13 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.114 2006/02/24 15:56:03 helly Exp $ */ +/* $Id: pdo_dbh.c,v 1.115 2006/02/24 16:04:13 helly Exp $ */ /* The PDO Database Handle Class */ @@ -1238,7 +1238,7 @@ #if PHP_MAJOR_VERSION > 5 || PHP_MINOR_VERSION >= 1 REGISTER_PDO_CLASS_CONST_LONG("FETCH_SERIALIZE",(long)PDO_FETCH_SERIALIZE); #endif - REGISTER_PDO_CLASS_CONST_LONG("FETCH_PROPSLATE",(long)PDO_FETCH_PROPSLATE); + REGISTER_PDO_CLASS_CONST_LONG("FETCH_PROPS_LATE",(long)PDO_FETCH_PROPS_LATE); REGISTER_PDO_CLASS_CONST_LONG("FETCH_NAMED",(long)PDO_FETCH_NAMED); REGISTER_PDO_CLASS_CONST_LONG("ATTR_AUTOCOMMIT", (long)PDO_ATTR_AUTOCOMMIT); http://cvs.php.net/viewcvs.cgi/pecl/pdo/pdo_stmt.c?r1=1.147&r2=1.148&diff_format=u Index: pecl/pdo/pdo_stmt.c diff -u pecl/pdo/pdo_stmt.c:1.147 pecl/pdo/pdo_stmt.c:1.148 --- pecl/pdo/pdo_stmt.c:1.147 Fri Feb 24 15:56:03 2006 +++ pecl/pdo/pdo_stmt.c Fri Feb 24 16:04:13 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.147 2006/02/24 15:56:03 helly Exp $ */ +/* $Id: pdo_stmt.c,v 1.148 2006/02/24 16:04:13 helly Exp $ */ /* The PDO Statement Handle Class */ @@ -838,7 +838,7 @@ return 0; } } - if (ce->constructor && (flags & PDO_FETCH_PROPSLATE)) { + if (ce->constructor && (flags & PDO_FETCH_PROPS_LATE)) { stmt->fetch.cls.fci.object_pp = &return_value; stmt->fetch.cls.fcc.object_pp = &return_value; if (zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) == FAILURE) { @@ -1012,7 +1012,7 @@ switch (how) { case PDO_FETCH_CLASS: - if (ce->constructor && !(flags & PDO_FETCH_PROPSLATE)) { + if (ce->constructor && !(flags & PDO_FETCH_PROPS_LATE)) { stmt->fetch.cls.fci.object_pp = &return_value; stmt->fetch.cls.fcc.object_pp = &return_value; if (zend_call_function(&stmt->fetch.cls.fci, &stmt->fetch.cls.fcc TSRMLS_CC) == FAILURE) { http://cvs.php.net/viewcvs.cgi/pecl/pdo/php_pdo_driver.h?r1=1.75&r2=1.76&diff_format=u Index: pecl/pdo/php_pdo_driver.h diff -u pecl/pdo/php_pdo_driver.h:1.75 pecl/pdo/php_pdo_driver.h:1.76 --- pecl/pdo/php_pdo_driver.h:1.75 Fri Feb 24 15:56:03 2006 +++ pecl/pdo/php_pdo_driver.h Fri Feb 24 16:04:13 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pdo_driver.h,v 1.75 2006/02/24 15:56:03 helly Exp $ */ +/* $Id: php_pdo_driver.h,v 1.76 2006/02/24 16:04:13 helly Exp $ */ #ifndef PHP_PDO_DRIVER_H #define PHP_PDO_DRIVER_H @@ -98,7 +98,7 @@ #define PDO_FETCH_UNIQUE 0x00030000 /* fetch into groups assuming first col is unique */ #define PDO_FETCH_CLASSTYPE 0x00040000 /* fetch class gets its class name from 1st column */ #define PDO_FETCH_SERIALIZE 0x00080000 /* fetch class instances by calling serialize */ -#define PDO_FETCH_PROPSLATE 0x00100000 /* fetch props after calling ctor */ +#define PDO_FETCH_PROPS_LATE 0x00100000 /* fetch props after calling ctor */ /* fetch orientation for scrollable cursors */ enum pdo_fetch_orientation { http://cvs.php.net/viewcvs.cgi/pecl/pdo/tests/bug_36428.phpt?r1=1.1&r2=1.2&diff_format=u Index: pecl/pdo/tests/bug_36428.phpt diff -u pecl/pdo/tests/bug_36428.phpt:1.1 pecl/pdo/tests/bug_36428.phpt:1.2 --- pecl/pdo/tests/bug_36428.phpt:1.1 Fri Feb 24 15:56:03 2006 +++ pecl/pdo/tests/bug_36428.phpt Fri Feb 24 16:04:13 2006 @@ -18,7 +18,7 @@ $db->exec("CREATE TABLE test (a VARCHAR(10))"); $db->exec("INSERT INTO test (a) VALUES ('xyz')"); $res = $db->query("SELECT a FROM test"); -var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPSLATE, 'SimpleXMLElement', array('<root/>'))); +var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPS_LATE, 'SimpleXMLElement', array('<root/>'))); ?> ===DONE===