wez Sat Feb 26 10:44:38 2005 EDT
Modified files:
/php-src/ext/pdo pdo_sql_parser.re
Log:
fix for PECL #3545
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_sql_parser.re?r1=1.19&r2=1.20&ty=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.19
php-src/ext/pdo/pdo_sql_parser.re:1.20
--- php-src/ext/pdo/pdo_sql_parser.re:1.19 Sun Feb 13 01:29:35 2005
+++ php-src/ext/pdo/pdo_sql_parser.re Sat Feb 26 10:44:38 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.19 2005/02/13 06:29:35 wez Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.20 2005/02/26 15:44:38 wez Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -189,18 +189,38 @@
ret = -1;
goto clean_up;
}
+ plc->freeq = 1;
} else {
- convert_to_string(param->parameter);
- if
(!stmt->dbh->methods->quoter(stmt->dbh, Z_STRVAL_P(param->parameter),
-
Z_STRLEN_P(param->parameter), &plc->quoted, &plc->qlen,
-
param->param_type TSRMLS_CC)) {
- /* bork */
- ret = -1;
- strcpy(stmt->error_code,
stmt->dbh->error_code);
- goto clean_up;
+ switch (Z_TYPE_P(param->parameter)) {
+ case IS_NULL:
+ plc->quoted = "NULL";
+ plc->qlen =
sizeof("NULL")-1;
+ plc->freeq = 0;
+ break;
+
+ case IS_BOOL:
+
convert_to_long(param->parameter);
+ case IS_LONG:
+ case IS_DOUBLE:
+
convert_to_string(param->parameter);
+ plc->qlen =
Z_STRLEN_P(param->parameter);
+ plc->quoted =
Z_STRLEN_P(param->parameter);
+ plc->freeq = 0;
+ break;
+
+ default:
+
convert_to_string(param->parameter);
+ if
(!stmt->dbh->methods->quoter(stmt->dbh, Z_STRVAL_P(param->parameter),
+
Z_STRLEN_P(param->parameter), &plc->quoted, &plc->qlen,
+
param->param_type TSRMLS_CC)) {
+ /* bork */
+ ret = -1;
+
strcpy(stmt->error_code, stmt->dbh->error_code);
+ goto clean_up;
+ }
+ plc->freeq = 1;
}
}
- plc->freeq = 1;
} else {
plc->quoted = Z_STRVAL_P(param->parameter);
plc->qlen = Z_STRLEN_P(param->parameter);-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
