cvs: php-src(PHP_5_1) /ext/pdo pdo_sql_parser.c pdo_sql_parser.re

iliaa Wed Jan 25 16:35:23 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pdo pdo_sql_parser.re pdo_sql_parser.c Log: 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.28.2.3&r2=1.28.2.4&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.3 php-src/ext/pdo/pdo_sql_parser.re:1.28.2.4 --- php-src/ext/pdo/pdo_sql_parser.re:1.28.2.3 Sun Jan 1 12:26:08 2006 +++ php-src/ext/pdo/pdo_sql_parser.re Wed Jan 25 16:35:23 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.re,v 1.28.2.3 2006/01/01 12:26:08 sniper Exp $ */ +/* $Id: pdo_sql_parser.re,v 1.28.2.4 2006/01/25 16:35:23 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.35.2.5&r2=1.35.2.6&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.5 php-src/ext/pdo/pdo_sql_parser.c:1.35.2.6 --- php-src/ext/pdo/pdo_sql_parser.c:1.35.2.5 Sun Jan 1 12:50:11 2006 +++ php-src/ext/pdo/pdo_sql_parser.c Wed Jan 25 16:35:23 2006 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.11 on Sun Jan 1 14:38:30 2006 */ +/* Generated by re2c 0.9.11 on Wed Jan 25 11:31:13 2006 */ #line 1 "ext/pdo/pdo_sql_parser.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_sql_parser.c,v 1.35.2.5 2006/01/01 12:50:11 sniper Exp $ */ +/* $Id: pdo_sql_parser.c,v 1.35.2.6 2006/01/25 16:35:23 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);