From 11a8c6440b13cbaf6f6d3cefb2e54cc0e70963a9 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Tue, 28 Mar 2023 16:46:34 +0900
Subject: [PATCH] Update DB\IO debug output for parameter queries

if value null set "NULL" else convert to string

Update class basic test with various type tests
---
 www/admin/class_test.db.php | 72 ++++++++++++++++++++++++++++---------
 www/lib/CoreLibs/DB/IO.php  |  4 ++-
 2 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/www/admin/class_test.db.php b/www/admin/class_test.db.php
index 036a8829..c79b6a22 100644
--- a/www/admin/class_test.db.php
+++ b/www/admin/class_test.db.php
@@ -226,54 +226,94 @@ print "EOM STRING PREPARE INSERT[ins_test_foo_eom] STATUS: " . Support::printToS
 	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
 	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
 
+echo "<b>*</b><br>";
 $status = $db->dbExecParams($query, ['EOM BAR TEST PARAMS ' . time()]);
-print "EOM STRING EXEC PARAMS INSERT[ins_test_foo_eom] STATUS: " . Support::printToString($status) . " |<br>"
+print "EOM STRING EXEC PARAMS INSERT STATUS: " . Support::printToString($status) . " |<br>"
 	. " |<br>"
 	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | "
 	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
 	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
 
-$query = <<<EOM
+// I/S Query
+$query_insert = <<<EOM
 INSERT INTO
 	test_foo
 (
-	test, some_bool, string_a, number_a, number_a_numeric, some_time
+	test, some_bool, string_a, number_a, number_a_numeric,
+	some_time, some_timestamp, json_string
 ) VALUES (
-	$1, $2, $3, $4, $5, $6
+	$1, $2, $3, $4, $5,
+	$6, $7, $8
 )
 RETURNING test
 EOM;
+$query_select = <<<EOM
+SELECT
+	test, some_bool, string_a, number_a, number_a_numeric,
+	some_time, some_time, some_timestamp, json_string
+FROM
+	test_foo
+WHERE
+	test_foo_id = $1
+EOM;
+// A
 $status = $db->dbExecParams(
-	$query,
+	$query_insert,
 	[
 		'EOM BAR TEST PARAMS MULTI ' . time(),
 		true,
 		'string a',
 		1,
 		1.5,
-		'1h'
+		'1h',
+		'2023-01-01 12:12:12',
+		json_encode(['a' => 'b', 'c' => 1])
 	]
 );
 $__last_insert_id = $db->dbGetInsertPK();
-print "EOM STRING EXEC PARAMS MULTI INSERT[ins_test_foo_eom] STATUS: " . Support::printToString($status) . " |<br>"
+echo "<b>*</b><br>";
+print "EOM STRING EXEC PARAMS MULTI INSERT STATUS: " . Support::printToString($status) . " |<br>"
 	. " |<br>"
 	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | "
 	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
 	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "<br>";
-$query = <<<EOM
-SELECT
-	test, some_bool, string_a, number_a, number_a_numeric, some_time
-FROM
-	test_foo
-WHERE
-	test_foo_id = $1
-EOM;
+
 print "EOM STRING EXEC RETURN TEST: " . print_r(
 	$db->dbReturnRowParams(
-		$query,
+		$query_select,
 		[$__last_insert_id]
 	)
 ) . "<br>";
+// B
+$status = $db->dbExecParams(
+	$query_insert,
+	[
+		'EOM BAR TEST PARAMS MULTI NULL ' . time(),
+		true,
+		'string a',
+		null,
+		null,
+		'1h',
+		null,
+		null
+	]
+);
+$__last_insert_id = $db->dbGetInsertPK();
+echo "<b>*</b><br>";
+print "EOM STRING EXEC PARAMS MULTI NULL INSERT STATUS: "
+	. Support::printToString($status) . " |<br>"
+	. " |<br>"
+	. "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | "
+	. "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | "
+	. "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true)
+	. "ERROR: " . $db->dbGetLastError(true) . "<br>";
+print "EOM STRING EXEC RETURN TEST: " . print_r(
+	$db->dbReturnRowParams(
+		$query_select,
+		[$__last_insert_id]
+	)
+) . "<br>";
+echo "<hr>";
 
 // returning test with multiple entries
 // $status = $db->db_exec(
diff --git a/www/lib/CoreLibs/DB/IO.php b/www/lib/CoreLibs/DB/IO.php
index aa681ea6..8f651593 100644
--- a/www/lib/CoreLibs/DB/IO.php
+++ b/www/lib/CoreLibs/DB/IO.php
@@ -892,7 +892,9 @@ class IO
 		for ($i = 0, $iMax = count($keys); $i < $iMax; $i++) {
 			$keys[$i] = '$' . ($keys[$i] + 1);
 			// prefix data set with parameter pos
-			$data[$i] = $keys[$i] . ':' . $data[$i];
+			$data[$i] = $keys[$i] . ':' . ($data[$i] === null ?
+				'"NULL"' : (string)$data[$i]
+			);
 		}
 		// simply replace the $1, $2, ... with the actual data and return it
 		return str_replace(