pgsql ext: pg_query_params/pg_send_query_params false constant handling proposal.

making a new subset of zend_get_string calls and concealed for the pgsql module for now.

Author: devnexen

Zend/zend_operators.c

@@ -882,14 +882,14 @@ ZEND_API double ZEND_FASTCALL zval_get_double_func(zval *op) /* {{{ */
 }
 /* }}} */
 
-static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_bool try) /* {{{ */
+static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_bool try, zend_bool noempbool) /* {{{ */
 {
 try_again:
 	switch (Z_TYPE_P(op)) {
 		case IS_UNDEF:
 		case IS_NULL:
 		case IS_FALSE:
-			return ZSTR_EMPTY_ALLOC();
+			return !noempbool ? ZSTR_EMPTY_ALLOC() : ZSTR_CHAR('0');
 		case IS_TRUE:
 			return ZSTR_CHAR('1');
 		case IS_RESOURCE: {
@@ -928,13 +928,25 @@ static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_boo
 
 ZEND_API zend_string* ZEND_FASTCALL zval_get_string_func(zval *op) /* {{{ */
 {
-	return __zval_get_string_func(op, 0);
+	return __zval_get_string_func(op, 0, 0);
 }
 /* }}} */
 
 ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_func(zval *op) /* {{{ */
 {
-	return __zval_get_string_func(op, 1);
+	return __zval_get_string_func(op, 1, 0);
+}
+/* }}} */
+
+ZEND_API zend_string* ZEND_FASTCALL zval_get_string_noempbool_func(zval *op) /* {{{ */
+{
+	return __zval_get_string_func(op, 0, 1);
+}
+/* }}} */
+
+ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_noempbool_func(zval *op) /* {{{ */
+{
+	return __zval_get_string_func(op, 1, 1);
 }
 /* }}} */
 

Zend/zend_operators.h

@@ -272,6 +272,8 @@ ZEND_API zend_long    ZEND_FASTCALL zval_get_long_func(zval *op);
 ZEND_API double       ZEND_FASTCALL zval_get_double_func(zval *op);
 ZEND_API zend_string* ZEND_FASTCALL zval_get_string_func(zval *op);
 ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_func(zval *op);
+ZEND_API zend_string* ZEND_FASTCALL zval_get_string_noempbool_func(zval *op);
+ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_noempbool_func(zval *op);
 
 static zend_always_inline zend_long zval_get_long(zval *op) {
 	return EXPECTED(Z_TYPE_P(op) == IS_LONG) ? Z_LVAL_P(op) : zval_get_long_func(op);
@@ -282,6 +284,9 @@ static zend_always_inline double zval_get_double(zval *op) {
 static zend_always_inline zend_string *zval_get_string(zval *op) {
 	return EXPECTED(Z_TYPE_P(op) == IS_STRING) ? zend_string_copy(Z_STR_P(op)) : zval_get_string_func(op);
 }
+static zend_always_inline zend_string *zval_get_string_noempbool(zval *op) {
+	return EXPECTED(Z_TYPE_P(op) == IS_STRING) ? zend_string_copy(Z_STR_P(op)) : zval_get_string_noempbool_func(op);
+}
 
 static zend_always_inline zend_string *zval_get_tmp_string(zval *op, zend_string **tmp) {
 	if (EXPECTED(Z_TYPE_P(op) == IS_STRING)) {
@@ -291,6 +296,14 @@ static zend_always_inline zend_string *zval_get_tmp_string(zval *op, zend_string
 		return *tmp = zval_get_string_func(op);
 	}
 }
+static zend_always_inline zend_string *zval_get_tmp_string_noempbool(zval *op, zend_string **tmp) {
+	if (EXPECTED(Z_TYPE_P(op) == IS_STRING)) {
+		*tmp = NULL;
+		return Z_STR_P(op);
+	} else {
+		return *tmp = zval_get_string_noempbool_func(op);
+	}
+}
 static zend_always_inline void zend_tmp_string_release(zend_string *tmp) {
 	if (UNEXPECTED(tmp)) {
 		zend_string_release_ex(tmp, 0);
@@ -307,6 +320,16 @@ static zend_always_inline zend_string *zval_try_get_string(zval *op) {
 		return zval_try_get_string_func(op);
 	}
 }
+/* Like zval_get_string, but returns NULL if the conversion fails with an exception. */
+static zend_always_inline zend_string *zval_try_get_string_noempbool(zval *op) {
+	if (EXPECTED(Z_TYPE_P(op) == IS_STRING)) {
+		zend_string *ret = zend_string_copy(Z_STR_P(op));
+		ZEND_ASSUME(ret != NULL);
+		return ret;
+	} else {
+		return zval_try_get_string_noempbool_func(op);
+	}
+}
 
 /* Like zval_get_tmp_string, but returns NULL if the conversion fails with an exception. */
 static zend_always_inline zend_string *zval_try_get_tmp_string(zval *op, zend_string **tmp) {
@@ -319,6 +342,17 @@ static zend_always_inline zend_string *zval_try_get_tmp_string(zval *op, zend_st
 		return *tmp = zval_try_get_string_func(op);
 	}
 }
+/* Like zval_get_tmp_string, but returns NULL if the conversion fails with an exception. */
+static zend_always_inline zend_string *zval_try_get_tmp_string_noempbool(zval *op, zend_string **tmp) {
+	if (EXPECTED(Z_TYPE_P(op) == IS_STRING)) {
+		zend_string *ret = Z_STR_P(op);
+		*tmp = NULL;
+		ZEND_ASSUME(ret != NULL);
+		return ret;
+	} else {
+		return *tmp = zval_try_get_string_noempbool_func(op);
+	}
+}
 
 /* Like convert_to_string(), but returns whether the conversion succeeded and does not modify the
  * zval in-place if it fails. */

ext/pgsql/pgsql.c

@@ -1120,7 +1120,7 @@ PHP_FUNCTION(pg_query_params)
 			if (Z_TYPE_P(tmp) == IS_NULL) {
 				params[i] = NULL;
 			} else {
-				zend_string *param_str = zval_try_get_string(tmp);
+				zend_string *param_str = zval_try_get_string_noempbool(tmp);
 				if (!param_str) {
 					_php_pgsql_free_params(params, num_params);
 					RETURN_THROWS();
@@ -3755,7 +3755,7 @@ PHP_FUNCTION(pg_send_query_params)
 				params[i] = NULL;
 			} else {
 				zend_string *tmp_str;
-				zend_string *str = zval_get_tmp_string(tmp, &tmp_str);
+				zend_string *str = zval_get_tmp_string_noempbool(tmp, &tmp_str);
 
 				params[i] = estrndup(ZSTR_VAL(str), ZSTR_LEN(str));
 				zend_tmp_string_release(tmp_str);

ext/pgsql/tests/33query_params_bool.phpt

@@ -0,0 +1,27 @@
+--TEST--
+PostgreSQL prepared queries with bool constants
+--SKIPIF--
+<?php
+include("skipif.inc");
+if (!function_exists('pg_prepare')) die('skip function pg_prepare() does not exist');
+?>
+--FILE--
+<?php
+
+include('config.inc');
+
+$db = pg_connect($conn_str);
+
+$version = pg_version($db);
+if ($version['protocol'] >= 3) {
+    $result = pg_query_params($db, "SELECT * FROM ".$table_name." WHERE;", array(true));
+    // bug occurs with false as it turns out as empty.
+    $result = pg_query_params($db, "SELECT * FROM ".$table_name." WHERE;", array(false));
+    pg_free_result($result);
+}
+pg_close($db);
+
+echo "OK";
+?>
+--EXPECT--
+OK