iliaa Fri Dec 29 00:35:26 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/pgsql pgsql.c
/php-src NEWS
Log:
MFH: Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for
timestamp fields).
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.244.2.40.2.4&r2=1.244.2.40.2.5&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.40.2.4
php-src/ext/pgsql/pgsql.c:1.244.2.40.2.5
--- php-src/ext/pgsql/pgsql.c:1.244.2.40.2.4 Thu Dec 28 15:21:41 2006
+++ php-src/ext/pgsql/pgsql.c Fri Dec 29 00:35:25 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.244.2.40.2.4 2006/12/28 15:21:41 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.244.2.40.2.5 2006/12/29 00:35:25 iliaa Exp $ */
#include <stdlib.h>
@@ -3772,14 +3772,14 @@
switch(Z_TYPE_PP(val)) {
case IS_STRING:
if (Z_STRLEN_PP(val) == 0) {
- ZVAL_STRING(new_val,
"NULL", 1);
- }
- else {
+ ZVAL_STRINGL(new_val,
"NULL", sizeof("NULL")-1, 1);
+ } else if
(!strcasecmp(Z_STRVAL_PP(val), "now()")) {
+ ZVAL_STRINGL(new_val,
"NOW()", sizeof("NOW()")-1, 1);
+ } else {
/* FIXME: better regex
must be used */
if
(php_pgsql_convert_match(Z_STRVAL_PP(val),
"^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([
\\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([
\\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[a-zA-Z]{1,5})){0,1})){0,1}$", 1
TSRMLS_CC) == FAILURE) {
err = 1;
- }
- else {
+ } else {
ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1);
php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
}
@@ -3787,7 +3787,7 @@
break;
case IS_NULL:
- ZVAL_STRING(new_val, "NULL", 1);
+ ZVAL_STRINGL(new_val, "NULL",
sizeof("NULL")-1, 1);
break;
default:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.179&r2=1.1247.2.920.2.180&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.179 php-src/NEWS:1.1247.2.920.2.180
--- php-src/NEWS:1.1247.2.920.2.179 Mon Dec 25 15:42:35 2006
+++ php-src/NEWS Fri Dec 29 00:35:25 2006
@@ -5,6 +5,8 @@
indexing the page. (Ilia)
- Updated PCRE to version 6.7. (Ilia)
- Fixed missing open_basedir check inside chdir() function. (Ilia)
+- Fixed bug #39971 (pg_insert/pg_update do not allow now() to be used for
+ timestamp fields). (Ilia)
- Fixed bug #39890 (using autoconf 2.6x and --with-layout=GNU breaks PEAR
install path). (Tony)
- Fixed bug #39653 (ext/dba doesn't check for db-4.5 and db-4.4 when db4
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
