Fix sqltype overwrite

Author: mlazdans

ibase_query.c

@@ -51,11 +51,6 @@
 #define FETCH_ROW       1
 #define FETCH_ARRAY     2
 
-typedef struct {
-	unsigned short vary_length;
-	char vary_string[1];
-} IBVARY;
-
 static int le_query;
 
 static void _php_ibase_alloc_xsqlda_vars(XSQLDA *sqlda, ISC_SHORT *nullinds);
@@ -96,6 +91,7 @@ static void _php_ibase_free_query(ibase_query *ib_query) /* {{{ */
 	if(ib_query->query)efree(ib_query->query);
 	if(ib_query->ht_aliases)zend_array_destroy(ib_query->ht_aliases);
 	if(ib_query->ht_ind)zend_array_destroy(ib_query->ht_ind);
+	if(ib_query->sql_types)efree(ib_query->sql_types);
 
 	efree(ib_query);
 }
@@ -314,12 +310,18 @@ static int _php_ibase_prepare(ibase_query **new_query, ibase_db_link *link, /* {
 		ib_query->in_sqlda->sqln = ib_query->in_fields_count;
 		ib_query->in_sqlda->version = SQLDA_CURRENT_VERSION;
 
+		ib_query->sql_types = emalloc(sizeof(*ib_query->sql_types) * ib_query->in_fields_count);
+
 		if (isc_dsql_describe_bind(IB_STATUS, &ib_query->stmt, SQLDA_CURRENT_VERSION, ib_query->in_sqlda)) {
 			IBDEBUG("isc_dsql_describe_bind() failed\n");
 			_php_ibase_error();
 			goto _php_ibase_alloc_query_error;
 		}
 
+		for (int i = 0; i < ib_query->in_fields_count; i++) {
+			ib_query->sql_types[i] = ib_query->in_sqlda->sqlvar[i].sqltype;
+		}
+
 		assert(ib_query->in_sqlda->sqln == ib_query->in_sqlda->sqld);
 		assert(ib_query->in_sqlda->sqld == ib_query->in_fields_count);
 
@@ -567,10 +569,12 @@ static int _php_ibase_bind(ibase_query *ib_query, zval *b_vars) /* {{{ */
 	int i, array_cnt = 0, rv = SUCCESS;
 
 	for (i = 0; i < sqlda->sqld; ++i) { /* bound vars */
-
 		zval *b_var = &b_vars[i];
 		XSQLVAR *var = &sqlda->sqlvar[i];
 
+		// We need keep track of original type because XSQLVAR type could get modified
+		var->sqltype = ib_query->sql_types[i];
+
 		var->sqlind = &buf[i].nullind;
 		var->sqldata = (void*)&buf[i].val;
 
@@ -742,7 +746,7 @@ static int _php_ibase_bind(ibase_query *ib_query, zval *b_vars) /* {{{ */
 						rv = FAILURE;
 						continue;
 				}
-				var->sqltype = SQL_BOOLEAN;
+				// var->sqltype = SQL_BOOLEAN;
 				continue;
 #endif
 			case SQL_ARRAY:
@@ -781,13 +785,13 @@ static int _php_ibase_bind(ibase_query *ib_query, zval *b_vars) /* {{{ */
 				}
 				++array_cnt;
 				continue;
-			} /* switch */
+		} /* switch */
 
-			/* we end up here if none of the switch cases handled the field */
-			convert_to_string(b_var);
-			var->sqldata = Z_STRVAL_P(b_var);
-			var->sqllen	 = (ISC_SHORT)Z_STRLEN_P(b_var);
-			var->sqltype = SQL_TEXT;
+		/* we end up here if none of the switch cases handled the field */
+		convert_to_string(b_var);
+		var->sqldata = Z_STRVAL_P(b_var);
+		var->sqllen = (ISC_SHORT)Z_STRLEN_P(b_var);
+		var->sqltype = SQL_TEXT; // Here: sqltype is modfied, can't rely on it for next calls
 	} /* for */
 	return rv;
 }

php_ibase_includes.h

@@ -127,6 +127,11 @@ typedef struct event {
 	enum event_state { NEW, ACTIVE, DEAD } state;
 } ibase_event;
 
+typedef struct {
+	unsigned short vary_length;
+	char vary_string[1];
+} IBVARY;
+
 /* sql variables union
  * used for convert and binding input variables
  */
@@ -167,6 +172,7 @@ typedef struct _ib_query {
 	ISC_UCHAR statement_type;
 	BIND_BUF *bind_buf;
 	ISC_SHORT *in_nullind, *out_nullind;
+	ISC_SHORT *sql_types;
 	ISC_USHORT in_fields_count, out_fields_count;
 	HashTable *ht_aliases, *ht_ind; // Precomputed for ibase_fetch_*()
 	int was_result_once;

tests/nulls_001.phpt

@@ -0,0 +1,136 @@
+--TEST--
+Test NULLs
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+
+require("interbase.inc");
+ibase_connect($test_base);
+
+(function(){
+    ibase_query(
+    "CREATE TABLE ITEMS (
+        ID INTEGER NOT null,
+        CODE1 VARCHAR(32) CHARACTER SET NONE,
+        CODE10 VARCHAR(32) CHARACTER SET NONE,
+        MAN_ID INTEGER
+    )");
+    ibase_commit_ret();
+
+    $data = [
+        [1, "CODE1 1", "CODE10 1", null],
+        [2, null, "CODE10 2", 101],
+        [3, "CODE1 3", null, null],
+        [4, null, null, 104],
+        [5, "CODE1 5", null, 105],
+        [6, "CODE1 6", "CODE10 6", null],
+        [7, null, "CODE10 7", 107],
+        [8, null, null, null],
+        [9, "CODE1 8", "CODE10 9", 109],
+    ];
+
+    $p = ibase_prepare(
+    "INSERT INTO ITEMS (
+        ID, CODE1, CODE10, MAN_ID
+    ) VALUES (?, ?, ?, ?)");
+
+    foreach ($data as $row) {
+        ibase_execute($p, ...$row);
+    }
+
+    dump_table_rows("ITEMS");
+})();
+
+?>
+--EXPECT--
+array(4) {
+  ["ID"]=>
+  int(1)
+  ["CODE1"]=>
+  string(7) "CODE1 1"
+  ["CODE10"]=>
+  string(8) "CODE10 1"
+  ["MAN_ID"]=>
+  NULL
+}
+array(4) {
+  ["ID"]=>
+  int(2)
+  ["CODE1"]=>
+  NULL
+  ["CODE10"]=>
+  string(8) "CODE10 2"
+  ["MAN_ID"]=>
+  int(101)
+}
+array(4) {
+  ["ID"]=>
+  int(3)
+  ["CODE1"]=>
+  string(7) "CODE1 3"
+  ["CODE10"]=>
+  NULL
+  ["MAN_ID"]=>
+  NULL
+}
+array(4) {
+  ["ID"]=>
+  int(4)
+  ["CODE1"]=>
+  NULL
+  ["CODE10"]=>
+  NULL
+  ["MAN_ID"]=>
+  int(104)
+}
+array(4) {
+  ["ID"]=>
+  int(5)
+  ["CODE1"]=>
+  string(7) "CODE1 5"
+  ["CODE10"]=>
+  NULL
+  ["MAN_ID"]=>
+  int(105)
+}
+array(4) {
+  ["ID"]=>
+  int(6)
+  ["CODE1"]=>
+  string(7) "CODE1 6"
+  ["CODE10"]=>
+  string(8) "CODE10 6"
+  ["MAN_ID"]=>
+  NULL
+}
+array(4) {
+  ["ID"]=>
+  int(7)
+  ["CODE1"]=>
+  NULL
+  ["CODE10"]=>
+  string(8) "CODE10 7"
+  ["MAN_ID"]=>
+  int(107)
+}
+array(4) {
+  ["ID"]=>
+  int(8)
+  ["CODE1"]=>
+  NULL
+  ["CODE10"]=>
+  NULL
+  ["MAN_ID"]=>
+  NULL
+}
+array(4) {
+  ["ID"]=>
+  int(9)
+  ["CODE1"]=>
+  string(7) "CODE1 8"
+  ["CODE10"]=>
+  string(8) "CODE10 9"
+  ["MAN_ID"]=>
+  int(109)
+}