MFB51: Properly rewrite queries where a bound parameter appears more then

once.

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 7b398f3b22206498396825d3ac7866cbf42f915d..b93d258322fffcb0d67359a4efad3c4d0bbde9b3 100644 (file)
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -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"
 /*
   +----------------------------------------------------------------------+
@@ -512,15 +512,25 @@ rewrite:
                }
 
                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);

diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index e90609b3dd5952eef6224cc624a3a9a75c117056..a976c1fa6e1e6141d4f9bea14eb3c0a8424ed210 100644 (file)
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -287,15 +287,25 @@ rewrite:
                }
 
                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);