From: Yasuo Ohgaki <yohgaki@php.net>
Date: Mon, 30 Sep 2002 07:35:41 +0000 (+0000)
Subject: Use PGSQL_CONV_FORCE_NULL as it is supposed.
X-Git-Tag: MODERN_SYMMETRIC_SESSION_BEHAVIOUR_20021003~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a6703484d22fb5dfa6cf4cdf85473215f0102f4;p=php

Use PGSQL_CONV_FORCE_NULL as it is supposed.
PGSQL_CONV_FORCE_NULL inserts NULL to field instead of
NULL string for string type tuples.
---

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 3cdb59a970..e2000a617b 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -3269,7 +3269,12 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval
 				switch (Z_TYPE_PP(val)) {
 					case IS_STRING:
 						if (Z_STRLEN_PP(val) == 0) {
-							ZVAL_STRING(new_val, empty_string, 1);
+							if (opt & PGSQL_CONV_FORCE_NULL) {
+								ZVAL_STRING(new_val, "NULL", 1);
+							}
+							else {
+								ZVAL_STRING(new_val, empty_string, 1);
+							}
 						}
 						else {
 							Z_TYPE_P(new_val) = IS_STRING;