cvs: php-src /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt
| From: | Felipe Pena | Date: | Wed, 05 Nov 2008 23:39:09 +0000 |
| Subject: | cvs: php-src /ext/pdo pdo_stmt.c /ext/pdo_sqlite/tests debugdumpparams_001.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53956@lists.php.net to get a copy of this message | ||
felipe Wed Nov 5 23:39:09 2008 UTC
Modified files:
/php-src/ext/pdo pdo_stmt.c
/php-src/ext/pdo_sqlite/tests debugdumpparams_001.phpt
Log:
- Fixed wrong check
- Improved test
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.207&r2=1.208&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.207 php-src/ext/pdo/pdo_stmt.c:1.208
--- php-src/ext/pdo/pdo_stmt.c:1.207 Mon Nov 3 23:43:51 2008
+++ php-src/ext/pdo/pdo_stmt.c Wed Nov 5 23:39:09 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.207 2008/11/03 23:43:51 felipe Exp $ */
+/* $Id: pdo_stmt.c,v 1.208 2008/11/05 23:39:09 felipe Exp $ */
/* The PDO Statement Handle Class */
@@ -2200,14 +2200,14 @@
uint len;
ulong num;
- if (zend_hash_get_current_key_ex(stmt->bound_params, &str, &len, &num, 0,
&pos) == HASH_KEY_IS_STRING) {
- php_stream_printf(out TSRMLS_CC, "Key: Position #%d:\n", num);
+ if (zend_hash_get_current_key_ex(stmt->bound_params, &str, &len, &num, 0,
&pos) == HASH_KEY_IS_LONG) {
+ php_stream_printf(out TSRMLS_CC, "Key: Position #%ld:\n", num);
} else {
php_stream_printf(out TSRMLS_CC, "Key: Name: [%d] %.*s\n", len, len, str);
}
- php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d]
%.*s\nis_param=%d\nparam_type=%d\n",
- param->paramno, param->namelen, param->namelen, param->name,
+ php_stream_printf(out TSRMLS_CC, "paramno=%d\nname=[%d]
\"%.*s\"\nis_param=%d\nparam_type=%d\n",
+ param->paramno, param->namelen, param->namelen, param->name ? param->name :
"",
param->is_param,
param->param_type);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt
diff -u php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1
php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.2
--- php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt:1.1 Mon Nov 3 20:45:43 2008
+++ php-src/ext/pdo_sqlite/tests/debugdumpparams_001.phpt Wed Nov 5 23:39:09 2008
@@ -9,23 +9,29 @@
$db = new pdo('sqlite:memory');
-$x= $db->prepare('select :a, :b');
+$x= $db->prepare('select :a, :b, ?');
$x->bindValue(':a', 1, PDO::PARAM_INT);
$x->bindValue(':b', 'foo');
+$x->bindValue(3, 1313);
var_dump($x->debugDumpParams());
?>
--EXPECT--
-SQL: [13] select :a, :b
-Params: 2
-Key: Position #0:
+SQL: [16] select :a, :b, ?
+Params: 3
+Key: Name: [2] :a
paramno=-1
-name=[2] :a
+name=[2] ":a"
is_param=1
param_type=1
-Key: Position #0:
+Key: Name: [2] :b
paramno=-1
-name=[2] :b
+name=[2] ":b"
+is_param=1
+param_type=2
+Key: Position #2:
+paramno=2
+name=[0] ""
is_param=1
param_type=2
NULL