cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c

From: Date: Sat, 10 Sep 2005 19:32:17 +0000
Subject: cvs: php-src(PHP_5_1) /ext/pdo pdo_stmt.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-33885@lists.php.net to get a copy of this message
wez Sat Sep 10 15:32:17 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo pdo_stmt.c Log: closes PECL #5027; PDO_FETCH_NAMED not handled via setFetchMode(). http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.3&r2=1.118.2.4&ty=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.3 php-src/ext/pdo/pdo_stmt.c:1.118.2.4 --- php-src/ext/pdo/pdo_stmt.c:1.118.2.3 Sat Sep 10 13:48:44 2005 +++ php-src/ext/pdo/pdo_stmt.c Sat Sep 10 15:32:15 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.118.2.3 2005/09/10 17:48:44 wez Exp $ */ +/* $Id: pdo_stmt.c,v 1.118.2.4 2005/09/10 19:32:15 wez Exp $ */ /* The PDO Statement Handle Class */ @@ -1646,6 +1646,7 @@ case PDO_FETCH_BOTH: case PDO_FETCH_OBJ: case PDO_FETCH_BOUND: + case PDO_FETCH_NAMED: break; case PDO_FETCH_COLUMN: @@ -1713,7 +1714,11 @@ break; default: - pdo_raise_impl_error(stmt->dbh, stmt, "22003", "mode is out of range" TSRMLS_CC); + if ((mode & ~PDO_FETCH_FLAGS) < PDO_FETCH__MAX && (mode & ~PDO_FETCH_FLAGS) >= 0) { + pdo_raise_impl_error(stmt->dbh, stmt, "22003", "unhandled mode; this is a PDO bug, please report it" TSRMLS_CC); + } else { + pdo_raise_impl_error(stmt->dbh, stmt, "22003", "mode is out of range" TSRMLS_CC); + } return FAILURE; }

« previous php.cvs (#33885) next »