[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c /ext/pdo/tests bug_43139.phpt

[Ilia Alshanetsky]

iliaa           Wed Oct 31 12:57:51 2007 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/ext/pdo/tests      bug_43139.phpt 

  Modified files:              
    /php-src/ext/pdo    pdo_stmt.c 
  Log:
  Fixed bug #43139 PDO ignores ATTR_DEFAULT_FETCH_MODE in some cases with 
fetchAll()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.4&r2=1.118.2.38.2.24.2.5&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.4 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.5
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.4      Thu Oct 11 20:54:41 2007
+++ php-src/ext/pdo/pdo_stmt.c  Wed Oct 31 12:57:51 2007
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.4 2007/10/11 20:54:41 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.5 2007/10/31 12:57:51 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -1546,6 +1546,10 @@
                }
        }
 
+       if ((how & ~PDO_FETCH_FLAGS) == PDO_FETCH_USE_DEFAULT) {
+               how |= stmt->default_fetch_type & ~PDO_FETCH_FLAGS;
+       }
+
        if (!error)     {
                PDO_STMT_CLEAR_ERR();
                MAKE_STD_ZVAL(data);

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug_43139.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo/tests/bug_43139.phpt
+++ php-src/ext/pdo/tests/bug_43139.phpt

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php