From 48271a8659e05b5f9c06fde2dfdb33f9833d58cb Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 28 Mar 2023 16:48:36 +0900 Subject: [PATCH] Composer update --- www/admin/class_test.db.php | 72 ++++++++++++++----- www/composer.lock | 4 +- www/vendor/composer/installed.json | 6 +- www/vendor/composer/installed.php | 6 +- .../publish/last.published | 2 +- .../corelibs-composer-all/src/DB/IO.php | 4 +- 6 files changed, 68 insertions(+), 26 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) . "
"; +echo "*
"; $status = $db->dbExecParams($query, ['EOM BAR TEST PARAMS ' . time()]); -print "EOM STRING EXEC PARAMS INSERT[ins_test_foo_eom] STATUS: " . Support::printToString($status) . " |
" +print "EOM STRING EXEC PARAMS INSERT STATUS: " . Support::printToString($status) . " |
" . " |
" . "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | " . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | " . "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "
"; -$query = <<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) . " |
" +echo "*
"; +print "EOM STRING EXEC PARAMS MULTI INSERT STATUS: " . Support::printToString($status) . " |
" . " |
" . "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | " . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | " . "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) . "
"; -$query = <<dbReturnRowParams( - $query, + $query_select, [$__last_insert_id] ) ) . "
"; +// 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 "*
"; +print "EOM STRING EXEC PARAMS MULTI NULL INSERT STATUS: " + . Support::printToString($status) . " |
" + . " |
" + . "PRIMARY KEY: " . Support::printToString($db->dbGetInsertPK()) . " | " + . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | " + . "RETURNING RETURN: " . print_r($db->dbGetReturningArray(), true) + . "ERROR: " . $db->dbGetLastError(true) . "
"; +print "EOM STRING EXEC RETURN TEST: " . print_r( + $db->dbReturnRowParams( + $query_select, + [$__last_insert_id] + ) +) . "
"; +echo "
"; // returning test with multiple entries // $status = $db->db_exec( diff --git a/www/composer.lock b/www/composer.lock index 416fa01f..f62d024a 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -8,11 +8,11 @@ "packages": [ { "name": "egrajp/corelibs-composer-all", - "version": "dev-development", + "version": "dev-master", "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "9616d956cb2e2e672125f16d7832e4aa36702197" + "reference": "4a246bec5f8e9944a77e1997f0f40c7f4f936528" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 63f9e6df..3c379db4 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -2,12 +2,12 @@ "packages": [ { "name": "egrajp/corelibs-composer-all", - "version": "dev-development", - "version_normalized": "dev-development", + "version": "dev-master", + "version_normalized": "dev-master", "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "9616d956cb2e2e672125f16d7832e4aa36702197" + "reference": "4a246bec5f8e9944a77e1997f0f40c7f4f936528" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index 773e6f08..37788099 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -11,9 +11,9 @@ ), 'versions' => array( 'egrajp/corelibs-composer-all' => array( - 'pretty_version' => 'dev-development', - 'version' => 'dev-development', - 'reference' => '9616d956cb2e2e672125f16d7832e4aa36702197', + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => '4a246bec5f8e9944a77e1997f0f40c7f4f936528', 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'aliases' => array(), diff --git a/www/vendor/egrajp/corelibs-composer-all/publish/last.published b/www/vendor/egrajp/corelibs-composer-all/publish/last.published index 404f7d9a..8104cabd 100644 --- a/www/vendor/egrajp/corelibs-composer-all/publish/last.published +++ b/www/vendor/egrajp/corelibs-composer-all/publish/last.published @@ -1 +1 @@ -8.0.7 +8.1.0 diff --git a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php index aa681ea6..8f651593 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/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(