felipe Thu Oct 23 18:56:05 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/pdo_pgsql/tests bug43925.phpt
Modified files:
/php-src/ext/pdo pdo_sql_parser.c pdo_sql_parser.re
Log:
- MFH: Fixed bug #43925 (Incorrect argument counter in prepared statements
with pgsql)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.35.2.6.2.16&r2=1.35.2.6.2.17&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.16
php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.17
--- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6.2.16 Fri Oct 10 12:11:36 2008
+++ php-src/ext/pdo/pdo_sql_parser.c Thu Oct 23 18:56:05 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Fri Oct 10 09:03:26 2008 */
+/* Generated by re2c 0.13.5 on Thu Oct 23 16:18:59 2008 */
#line 1 "ext/pdo/pdo_sql_parser.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.16 2008/10/10 12:11:36 felipe Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.35.2.6.2.17 2008/10/23 18:56:05 felipe Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -553,6 +553,7 @@
char idxbuf[32];
const char *tmpl = stmt->named_rewrite_template ?
stmt->named_rewrite_template : ":pdo%d";
char *name;
+ int bind_no = 1;
newbuffer_len = inquery_len;
@@ -568,7 +569,7 @@
/* check if bound parameter is already available */
if (!strcmp(name, "?") ||
zend_hash_find(stmt->bound_param_map, name, plc->len + 1, (void**) &p) ==
FAILURE) {
- snprintf(idxbuf, sizeof(idxbuf), tmpl,
plc->bindno + 1);
+ snprintf(idxbuf, sizeof(idxbuf), tmpl,
bind_no++);
} else {
memset(idxbuf, 0, sizeof(idxbuf));
memcpy(idxbuf, p, sizeof(idxbuf));
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.28.2.4.2.13&r2=1.28.2.4.2.14&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.13
php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.14
--- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4.2.13 Fri Oct 10 12:11:36 2008
+++ php-src/ext/pdo/pdo_sql_parser.re Thu Oct 23 18:56:05 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.13 2008/10/10 12:11:36 felipe Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.28.2.4.2.14 2008/10/23 18:56:05 felipe Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -302,6 +302,7 @@
char idxbuf[32];
const char *tmpl = stmt->named_rewrite_template ?
stmt->named_rewrite_template : ":pdo%d";
char *name;
+ int bind_no = 1;
newbuffer_len = inquery_len;
@@ -317,7 +318,7 @@
/* check if bound parameter is already available */
if (!strcmp(name, "?") ||
zend_hash_find(stmt->bound_param_map, name, plc->len + 1, (void**) &p) ==
FAILURE) {
- snprintf(idxbuf, sizeof(idxbuf), tmpl,
plc->bindno + 1);
+ snprintf(idxbuf, sizeof(idxbuf), tmpl,
bind_no++);
} else {
memset(idxbuf, 0, sizeof(idxbuf));
memcpy(idxbuf, p, sizeof(idxbuf));
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/tests/bug43925.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_pgsql/tests/bug43925.phpt
+++ php-src/ext/pdo_pgsql/tests/bug43925.phpt
--TEST--
Bug #43925 (Incorrect argument counter in prepared statements with pgsql)
--SKIPIF--
<?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not
loaded');
require dirname(__FILE__) . '/config.inc';
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?>
--FILE--
<?php
require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
$dbh = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
@$dbh->query('DROP TABLE nodes');
$dbh->query('
CREATE TABLE nodes
(
id integer NOT NULL PRIMARY KEY
, root integer NOT NULL
, lft integer NOT NULL
, rgt integer NOT NULL
);');
$dbh->query('INSERT INTO nodes (id, root, lft, rgt) VALUES (1, 1, 1, 6);');
$dbh->query('INSERT INTO nodes (id, root, lft, rgt) VALUES (2, 1, 2, 3);');
$dbh->query('INSERT INTO nodes (id, root, lft, rgt) VALUES (3, 1, 4, 5);');
$stmt = $dbh->prepare('
SELECT *
FROM nodes
WHERE (:rootId > 0 OR lft > :left OR rgt > :left)
AND (root = :rootId OR root = :left)
AND (1 > :left OR 1 < :left OR 1 = :left)
AND (:x > 0 OR :x < 10 OR :x > 100)
OR :y = 1 OR :left = 1
');
$stmt->bindValue('left', 1, PDO::PARAM_INT);
$stmt->bindValue('rootId', 3, PDO::PARAM_INT);
$stmt->bindValue('x', 5, PDO::PARAM_INT);
$stmt->bindValue('y', 50, PDO::PARAM_INT);
$stmt->execute();
foreach ($stmt->fetchAll() as $row) {
print implode(' - ', $row);
print "\n";
}
$dbh->query('DROP TABLE nodes');
?>
--EXPECTF--
1 - 1 - 1 - 1 - 1 - 1 - 6 - 6
2 - 2 - 1 - 1 - 2 - 2 - 3 - 3
3 - 3 - 1 - 1 - 4 - 4 - 5 - 5
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
