diff --git a/www/admin/class_test.db.php b/www/admin/class_test.db.php index 5ca62573..afaefc92 100644 --- a/www/admin/class_test.db.php +++ b/www/admin/class_test.db.php @@ -413,13 +413,35 @@ if (is_array($s_res = $db->dbReturnRow($q)) && !empty($s_res['test'])) { } // UPDATE WITH RETURNING -$status = $db->dbExec("UPDATE test_foo SET test = 'SOMETHING DIFFERENT' " - . "WHERE test_foo_id = " . (int)$last_insert_pk . " RETURNING test"); +$status = $db->dbExec("UPDATE test_foo SET test = 'SOMETHING DIFFERENT', string_a = '" . (string)rand(1, 100) . "' " + . "WHERE test_foo_id = " . (int)$last_insert_pk . " RETURNING test_foo.test, string_a"); print "UPDATE WITH PK " . Support::printToString($last_insert_pk) . " RETURN STATUS: " . Support::printToString($status) . " |
" . "QUERY: " . $db->dbGetQuery() . " |
" . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | " . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "
"; +// UPDATE BUT EOM STYLE +$status = $db->dbExecParams( + <<" + . "QUERY: " . $db->dbGetQuery() . " |
" + . "RETURNING EXT: " . print_r($db->dbGetReturningExt(), true) . " | " + . "RETURNING ARRAY: " . print_r($db->dbGetReturningArray(), true) . "
"; + +// a stand alone insert? $db->dbExec("INSERT INTO test_foo (test) VALUES ('STAND ALONE')"); // INSERT WITH NO RETURNING diff --git a/www/composer.lock b/www/composer.lock index bf73809f..a8e0137a 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": "0e6a43a2c286dcd78720287c344891db633edbfd" + "reference": "f2d537734722059e6342d3cdc44ece9f63a50382" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 49abe737..0ad44d9d 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": "0e6a43a2c286dcd78720287c344891db633edbfd" + "reference": "f2d537734722059e6342d3cdc44ece9f63a50382" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index 11340130..99aa73e0 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' => '0e6a43a2c286dcd78720287c344891db633edbfd', + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => 'f2d537734722059e6342d3cdc44ece9f63a50382', '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 0e791524..6b409d97 100644 --- a/www/vendor/egrajp/corelibs-composer-all/publish/last.published +++ b/www/vendor/egrajp/corelibs-composer-all/publish/last.published @@ -1 +1 @@ -8.1.1 +8.1.2 diff --git a/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh b/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh index e608d39c..ad39db40 100755 --- a/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh +++ b/www/vendor/egrajp/corelibs-composer-all/publish/publish.sh @@ -31,6 +31,7 @@ source .env.deploy; cd -; set +o allexport; +echo "[START]"; # gitea if [ ! -z "${GITEA_USER}" ] && [ ! -z "${GITEA_TOKEN}" ]; then curl -LJO \ @@ -56,5 +57,7 @@ if [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then else echo "Missing GITLAB_DEPLOY_TOKEN environment variable"; fi; +echo ""; +echo "[DONE]"; # __END__ 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 f54cc823..6e2b8814 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php @@ -280,7 +280,7 @@ class IO /** @var string default hash type */ public const ERROR_HASH_TYPE = 'adler32'; /** @var string regex to get returning with matches at position 1 */ - public const REGEX_RETURNING = '/\s+returning\s+(.+?);?$/i'; + public const REGEX_RETURNING = '/\s+returning\s+(.+\s*(?:.+\s*)+);?$/i'; // recommend to set private/protected and only allow setting via method // can bet set from outside