mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
- Fixed bug #43925 (Incorrect argument counter in prepared statements with pgsql)
This commit is contained in:
parent
c4effa74dc
commit
1d92251fe1
@ -1,4 +1,4 @@
|
|||||||
/* Generated by re2c 0.13.5 on Fri Oct 10 09:03:17 2008 */
|
/* Generated by re2c 0.13.5 on Thu Oct 23 16:16:52 2008 */
|
||||||
#line 1 "ext/pdo/pdo_sql_parser.re"
|
#line 1 "ext/pdo/pdo_sql_parser.re"
|
||||||
/*
|
/*
|
||||||
+----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
@ -553,6 +553,7 @@ rewrite:
|
|||||||
char idxbuf[32];
|
char idxbuf[32];
|
||||||
const char *tmpl = stmt->named_rewrite_template ? stmt->named_rewrite_template : ":pdo%d";
|
const char *tmpl = stmt->named_rewrite_template ? stmt->named_rewrite_template : ":pdo%d";
|
||||||
char *name;
|
char *name;
|
||||||
|
int bind_no = 1;
|
||||||
|
|
||||||
newbuffer_len = inquery_len;
|
newbuffer_len = inquery_len;
|
||||||
|
|
||||||
@ -568,7 +569,7 @@ rewrite:
|
|||||||
|
|
||||||
/* check if bound parameter is already available */
|
/* check if bound parameter is already available */
|
||||||
if (!strcmp(name, "?") || zend_hash_find(stmt->bound_param_map, name, plc->len + 1, (void**) &p) == FAILURE) {
|
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 {
|
} else {
|
||||||
memset(idxbuf, 0, sizeof(idxbuf));
|
memset(idxbuf, 0, sizeof(idxbuf));
|
||||||
memcpy(idxbuf, p, sizeof(idxbuf));
|
memcpy(idxbuf, p, sizeof(idxbuf));
|
||||||
|
@ -302,6 +302,7 @@ rewrite:
|
|||||||
char idxbuf[32];
|
char idxbuf[32];
|
||||||
const char *tmpl = stmt->named_rewrite_template ? stmt->named_rewrite_template : ":pdo%d";
|
const char *tmpl = stmt->named_rewrite_template ? stmt->named_rewrite_template : ":pdo%d";
|
||||||
char *name;
|
char *name;
|
||||||
|
int bind_no = 1;
|
||||||
|
|
||||||
newbuffer_len = inquery_len;
|
newbuffer_len = inquery_len;
|
||||||
|
|
||||||
@ -317,7 +318,7 @@ rewrite:
|
|||||||
|
|
||||||
/* check if bound parameter is already available */
|
/* check if bound parameter is already available */
|
||||||
if (!strcmp(name, "?") || zend_hash_find(stmt->bound_param_map, name, plc->len + 1, (void**) &p) == FAILURE) {
|
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 {
|
} else {
|
||||||
memset(idxbuf, 0, sizeof(idxbuf));
|
memset(idxbuf, 0, sizeof(idxbuf));
|
||||||
memcpy(idxbuf, p, sizeof(idxbuf));
|
memcpy(idxbuf, p, sizeof(idxbuf));
|
||||||
|
59
ext/pdo_pgsql/tests/bug43925.phpt
Normal file
59
ext/pdo_pgsql/tests/bug43925.phpt
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
--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
|
Loading…
Reference in New Issue
Block a user