]> granicus.if.org Git - php/commitdiff
- s/FETCH_PROPSLATE/FETCH_PROPS_LATE/ as per IRC discussion
authorMarcus Boerger <helly@php.net>
Fri, 24 Feb 2006 16:04:13 +0000 (16:04 +0000)
committerMarcus Boerger <helly@php.net>
Fri, 24 Feb 2006 16:04:13 +0000 (16:04 +0000)
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo/php_pdo_driver.h
ext/pdo/tests/bug_36428.phpt

index e9ff63e48a87e9fba878de65d23737d8f4969820..b1a7947e4972814f27174f89a98e837a8434e6bb 100755 (executable)
@@ -1238,7 +1238,7 @@ void pdo_dbh_init(TSRMLS_D)
 #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);
index 9a122d294c4af9140a45085d378f1a39eafcde48..36eb6128d88d723e995495bce66fdfe5741f5e03 100755 (executable)
@@ -838,7 +838,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
                                                        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 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
                
                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) {
index 889a355bd6d405005e6dd8c88532b4c2423a064e..fd9f10fe2e566025c3fd8fb4348836ff2d700517 100755 (executable)
@@ -98,7 +98,7 @@ enum pdo_fetch_type {
 #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 {
index 1aea012c698f516503f24ed0bd3bd0aac30b89ed..6abba6bd7c673d39b285730b8e13ed98f7c3beb7 100755 (executable)
@@ -18,7 +18,7 @@ $db = PDOTest::factory();
 $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===