diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-04-18 22:50:21 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-04-18 22:50:21 +0200 |
| commit | 900751e8ae4ed2af3e63e7c355fac59f6f932254 (patch) | |
| tree | ada5a6accea9b45e8b5deb5ef0483d194547835d | |
| parent | 56d8d353009dbe9678fd292f205eaf32aca59b9e (diff) | |
| parent | e946eaca0bc747615fabd0fedb8a92ea800ed158 (diff) | |
| download | php-git-900751e8ae4ed2af3e63e7c355fac59f6f932254.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update generated file.
Ensure the SQL parser is regenerated after changes.
| -rw-r--r-- | ext/pdo/Makefile.frag | 4 | ||||
| -rw-r--r-- | ext/pdo/pdo_sql_parser.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag index 283a6e2433..98f5c5f2ad 100644 --- a/ext/pdo/Makefile.frag +++ b/ext/pdo/Makefile.frag @@ -4,6 +4,10 @@ PDO_HEADER_FILES= \ php_pdo.h \ php_pdo_driver.h + +$(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re + (cd $(top_srcdir); $(RE2C) -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re) + install-pdo-headers: @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c index d67f0e0b78..ed8af84527 100644 --- a/ext/pdo/pdo_sql_parser.c +++ b/ext/pdo/pdo_sql_parser.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Sat Jun 4 18:42:25 2011 */ +/* Generated by re2c 0.13.5 on Wed Apr 18 22:30:06 2012 */ #line 1 "ext/pdo/pdo_sql_parser.re" /* +----------------------------------------------------------------------+ @@ -569,7 +569,7 @@ safe: param->param_type TSRMLS_CC)) { /* bork */ ret = -1; - strcpy(stmt->error_code, stmt->dbh->error_code); + strncpy(stmt->error_code, stmt->dbh->error_code, 6); if (buf) { efree(buf); } @@ -592,6 +592,9 @@ safe: plc->freeq = 0; break; + case IS_BOOL: + convert_to_long(param->parameter); + case IS_LONG: case IS_DOUBLE: convert_to_string(param->parameter); @@ -600,8 +603,6 @@ safe: plc->freeq = 0; break; - case IS_BOOL: - convert_to_long(param->parameter); default: convert_to_string(param->parameter); if (!stmt->dbh->methods->quoter(stmt->dbh, Z_STRVAL_P(param->parameter), @@ -609,7 +610,7 @@ safe: param->param_type TSRMLS_CC)) { /* bork */ ret = -1; - strcpy(stmt->error_code, stmt->dbh->error_code); + strncpy(stmt->error_code, stmt->dbh->error_code, 6); goto clean_up; } plc->freeq = 1; |