iliaa Wed Jan 25 16:35:46 2006 UTC
Modified files:
/php-src/ext/pdo pdo_sql_parser.re pdo_sql_parser.c
Log:
MFB51: Properly rewrite queries where a bound parameter appears more then
once.
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.31&r2=1.32&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.31
php-src/ext/pdo/pdo_sql_parser.re:1.32
--- php-src/ext/pdo/pdo_sql_parser.re:1.31 Sun Jan 1 13:09:52 2006
+++ php-src/ext/pdo/pdo_sql_parser.re Wed Jan 25 16:35:46 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.31 2006/01/01 13:09:52 sniper Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.32 2006/01/25 16:35:46 iliaa Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -287,15 +287,25 @@
}
for (plc = placeholders; plc; plc = plc->next) {
- snprintf(idxbuf, sizeof(idxbuf), tmpl, plc->bindno + 1);
+ int skip_map = 0;
+ char *p;
+ name = estrndup(plc->pos, plc->len);
+
+ /* 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);
+ } else {
+ memset(idxbuf, 0, sizeof(idxbuf));
+ memcpy(idxbuf, p, sizeof(idxbuf));
+ skip_map = 1;
+ }
+
plc->quoted = estrdup(idxbuf);
plc->qlen = strlen(plc->quoted);
plc->freeq = 1;
newbuffer_len += plc->qlen;
- name = estrndup(plc->pos, plc->len);
-
- if (stmt->named_rewrite_template) {
+ if (!skip_map && stmt->named_rewrite_template) {
/* create a mapping */
zend_hash_update(stmt->bound_param_map, name,
plc->len + 1, idxbuf, plc->qlen + 1, NULL);
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_sql_parser.c?r1=1.40&r2=1.41&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.c
diff -u php-src/ext/pdo/pdo_sql_parser.c:1.40
php-src/ext/pdo/pdo_sql_parser.c:1.41
--- php-src/ext/pdo/pdo_sql_parser.c:1.40 Sun Jan 1 13:09:52 2006
+++ php-src/ext/pdo/pdo_sql_parser.c Wed Jan 25 16:35:46 2006
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.11 on Sun Dec 18 21:54:24 2005 */
+/* Generated by re2c 0.9.11 on Wed Jan 25 11:35:39 2006 */
#line 1 "ext/pdo/pdo_sql_parser.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.c,v 1.40 2006/01/01 13:09:52 sniper Exp $ */
+/* $Id: pdo_sql_parser.c,v 1.41 2006/01/25 16:35:46 iliaa Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -512,15 +512,25 @@
}
for (plc = placeholders; plc; plc = plc->next) {
- snprintf(idxbuf, sizeof(idxbuf), tmpl, plc->bindno + 1);
+ int skip_map = 0;
+ char *p;
+ name = estrndup(plc->pos, plc->len);
+
+ /* 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);
+ } else {
+ memset(idxbuf, 0, sizeof(idxbuf));
+ memcpy(idxbuf, p, sizeof(idxbuf));
+ skip_map = 1;
+ }
+
plc->quoted = estrdup(idxbuf);
plc->qlen = strlen(plc->quoted);
plc->freeq = 1;
newbuffer_len += plc->qlen;
- name = estrndup(plc->pos, plc->len);
-
- if (stmt->named_rewrite_template) {
+ if (!skip_map && stmt->named_rewrite_template) {
/* create a mapping */
zend_hash_update(stmt->bound_param_map, name,
plc->len + 1, idxbuf, plc->qlen + 1, NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
