From 6b400978ac7f4085d30198ebb32c7093286275af Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 11 Apr 2023 11:02:26 +0900 Subject: [PATCH] ComposerLib update --- 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 | 74 +++++++++++++------ 5 files changed, 60 insertions(+), 32 deletions(-) diff --git a/www/composer.lock b/www/composer.lock index 67bcc592..886af710 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -8,11 +8,11 @@ "packages": [ { "name": "egrajp/corelibs-composer-all", - "version": "dev-master", + "version": "dev-development", "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "187a012284ba8000b2d472da6a707b830bb3c0a8" + "reference": "14a5250cd7dc019107a346a4000b9e419047d55e" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index 768a8d6b..52602085 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-master", - "version_normalized": "dev-master", + "version": "dev-development", + "version_normalized": "dev-development", "dist": { "type": "path", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", - "reference": "187a012284ba8000b2d472da6a707b830bb3c0a8" + "reference": "14a5250cd7dc019107a346a4000b9e419047d55e" }, "require": { "php": ">=8.1" diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index 1cc8ec22..a5be82f3 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-master', - 'version' => 'dev-master', - 'reference' => '187a012284ba8000b2d472da6a707b830bb3c0a8', + 'pretty_version' => 'dev-development', + 'version' => 'dev-development', + 'reference' => '14a5250cd7dc019107a346a4000b9e419047d55e', '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 ac2895c5..fbb9ea12 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.4 +8.2.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 b2b0b8d1..f637aa70 100644 --- a/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php +++ b/www/vendor/egrajp/corelibs-composer-all/src/DB/IO.php @@ -1146,7 +1146,7 @@ class IO $this->params ), '__dbPrepareExec', - ($this->params === [] ? 'Q' : 'Qp'), + ($this->params === [] ? 'Q' : 'Qp') ); } // import protection, hash needed @@ -1166,7 +1166,15 @@ class IO $this->query_called[$query_hash] > $this->MAX_QUERY_CALL ) { $this->__dbError(30, false, $this->query); - $this->__dbDebug('db', $this->query, 'dbExec', 'Q[nc]'); + $this->__dbDebug( + 'db', + $this->__dbDebugPrepare( + $this->query, + $this->params + ), + 'dbExec', + ($this->params === [] ? 'Q[nc]' : 'Qp[nc]') + ); return false; } $this->query_called[$query_hash] ++; @@ -1945,6 +1953,18 @@ class IO // check if params count matches // checks if the params count given matches the expected count if ($this->__dbCheckQueryParams($query, count($params)) === false) { + // in case we got an error print out query + if ($this->db_debug) { + $this->__dbDebug( + 'db', + $this->__dbDebugPrepare( + $this->query, + $this->params + ), + 'dbReturn', + ($this->params === [] ? 'Q[e]' : 'Qp[e]') + ); + } return false; } // set first call to false @@ -1968,7 +1988,15 @@ class IO $this->cursor_ext[$query_hash]['log'][] = 'No cursor'; // for DEBUG, print out each query executed if ($this->db_debug) { - $this->__dbDebug('db', $this->cursor_ext[$query_hash]['query'], 'dbReturn', 'Q'); + $this->__dbDebug( + 'db', + $this->__dbDebugPrepare( + $this->cursor_ext[$query_hash]['query'], + $this->cursor_ext[$query_hash]['params'] + ), + 'dbReturn', + ($this->cursor_ext[$query_hash]['params'] === [] ? 'Q' : 'Qp'), + ); } // if no DB Handler try to reconnect if (!$this->dbh) { @@ -1997,7 +2025,15 @@ class IO // if still no cursor ... if (!$this->cursor_ext[$query_hash]['cursor']) { if ($this->db_debug) { - $this->__dbDebug('db', $this->cursor_ext[$query_hash]['query'], 'dbReturn', 'Q'); + $this->__dbDebug( + 'db', + $this->__dbDebugPrepare( + $this->cursor_ext[$query_hash]['query'], + $this->cursor_ext[$query_hash]['params'] + ), + 'dbReturn', + ($this->cursor_ext[$query_hash]['params'] === [] ? 'Q[e]' : 'Qp[e]'), + ); } // internal error handling $this->__dbError(13, $this->cursor_ext[$query_hash]['cursor']); @@ -2300,10 +2336,6 @@ class IO $this->__dbError(17, false, $query); return false; } - // checks if the params count given matches the expected count - if ($this->__dbCheckQueryParams($query, count($params)) === false) { - return false; - } $cursor = $this->dbExecParams($query, $params); if ($cursor === false) { return false; @@ -2348,10 +2380,6 @@ class IO $this->__dbError(17, false, $query); return false; } - // checks if the params count given matches the expected count - if ($this->__dbCheckQueryParams($query, count($params)) === false) { - return false; - } $cursor = $this->dbExecParams($query, $params); if ($cursor === false) { return false; @@ -2661,6 +2689,17 @@ class IO ); return false; } + if ($this->db_debug) { + $this->__dbDebug( + 'db', + $this->__dbDebugPrepare( + $this->prepare_cursor[$stm_name]['query'], + $data + ), + 'dbExecPrep', + 'Qpe' + ); + } // if the count does not match if ($this->prepare_cursor[$stm_name]['count'] != count($data)) { $this->__dbError( @@ -2673,17 +2712,6 @@ class IO ); return false; } - if ($this->db_debug) { - $this->__dbDebug( - 'db', - $this->__dbDebugPrepare( - $this->prepare_cursor[$stm_name]['query'], - $data - ), - 'dbExecPrep', - 'Qp' - ); - } $result = $this->db_functions->__dbExecute($stm_name, $data); if ($result === false) { $this->log->debug('ExecuteData', 'ERROR in STM[' . $stm_name . '|'