ComposerLib update

This commit is contained in:
Clemens Schwaighofer
2023-04-11 11:02:26 +09:00
parent 2754a718fa
commit 6b400978ac
5 changed files with 60 additions and 32 deletions

4
www/composer.lock generated
View File

@@ -8,11 +8,11 @@
"packages": [ "packages": [
{ {
"name": "egrajp/corelibs-composer-all", "name": "egrajp/corelibs-composer-all",
"version": "dev-master", "version": "dev-development",
"dist": { "dist": {
"type": "path", "type": "path",
"url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All",
"reference": "187a012284ba8000b2d472da6a707b830bb3c0a8" "reference": "14a5250cd7dc019107a346a4000b9e419047d55e"
}, },
"require": { "require": {
"php": ">=8.1" "php": ">=8.1"

View File

@@ -2,12 +2,12 @@
"packages": [ "packages": [
{ {
"name": "egrajp/corelibs-composer-all", "name": "egrajp/corelibs-composer-all",
"version": "dev-master", "version": "dev-development",
"version_normalized": "dev-master", "version_normalized": "dev-development",
"dist": { "dist": {
"type": "path", "type": "path",
"url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All", "url": "/storage/var/www/html/developers/clemens/core_data/composer-packages/CoreLibs-Composer-All",
"reference": "187a012284ba8000b2d472da6a707b830bb3c0a8" "reference": "14a5250cd7dc019107a346a4000b9e419047d55e"
}, },
"require": { "require": {
"php": ">=8.1" "php": ">=8.1"

View File

@@ -11,9 +11,9 @@
), ),
'versions' => array( 'versions' => array(
'egrajp/corelibs-composer-all' => array( 'egrajp/corelibs-composer-all' => array(
'pretty_version' => 'dev-master', 'pretty_version' => 'dev-development',
'version' => 'dev-master', 'version' => 'dev-development',
'reference' => '187a012284ba8000b2d472da6a707b830bb3c0a8', 'reference' => '14a5250cd7dc019107a346a4000b9e419047d55e',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all', 'install_path' => __DIR__ . '/../egrajp/corelibs-composer-all',
'aliases' => array(), 'aliases' => array(),

View File

@@ -1 +1 @@
8.1.4 8.2.0

View File

@@ -1146,7 +1146,7 @@ class IO
$this->params $this->params
), ),
'__dbPrepareExec', '__dbPrepareExec',
($this->params === [] ? 'Q' : 'Qp'), ($this->params === [] ? 'Q' : 'Qp')
); );
} }
// import protection, hash needed // import protection, hash needed
@@ -1166,7 +1166,15 @@ class IO
$this->query_called[$query_hash] > $this->MAX_QUERY_CALL $this->query_called[$query_hash] > $this->MAX_QUERY_CALL
) { ) {
$this->__dbError(30, false, $this->query); $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; return false;
} }
$this->query_called[$query_hash] ++; $this->query_called[$query_hash] ++;
@@ -1945,6 +1953,18 @@ class IO
// check if params count matches // check if params count matches
// checks if the params count given matches the expected count // checks if the params count given matches the expected count
if ($this->__dbCheckQueryParams($query, count($params)) === false) { 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; return false;
} }
// set first call to false // set first call to false
@@ -1968,7 +1988,15 @@ class IO
$this->cursor_ext[$query_hash]['log'][] = 'No cursor'; $this->cursor_ext[$query_hash]['log'][] = 'No cursor';
// for DEBUG, print out each query executed // for DEBUG, print out each query executed
if ($this->db_debug) { 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 no DB Handler try to reconnect
if (!$this->dbh) { if (!$this->dbh) {
@@ -1997,7 +2025,15 @@ class IO
// if still no cursor ... // if still no cursor ...
if (!$this->cursor_ext[$query_hash]['cursor']) { if (!$this->cursor_ext[$query_hash]['cursor']) {
if ($this->db_debug) { 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 // internal error handling
$this->__dbError(13, $this->cursor_ext[$query_hash]['cursor']); $this->__dbError(13, $this->cursor_ext[$query_hash]['cursor']);
@@ -2300,10 +2336,6 @@ class IO
$this->__dbError(17, false, $query); $this->__dbError(17, false, $query);
return false; 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); $cursor = $this->dbExecParams($query, $params);
if ($cursor === false) { if ($cursor === false) {
return false; return false;
@@ -2348,10 +2380,6 @@ class IO
$this->__dbError(17, false, $query); $this->__dbError(17, false, $query);
return false; 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); $cursor = $this->dbExecParams($query, $params);
if ($cursor === false) { if ($cursor === false) {
return false; return false;
@@ -2661,6 +2689,17 @@ class IO
); );
return false; 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 the count does not match
if ($this->prepare_cursor[$stm_name]['count'] != count($data)) { if ($this->prepare_cursor[$stm_name]['count'] != count($data)) {
$this->__dbError( $this->__dbError(
@@ -2673,17 +2712,6 @@ class IO
); );
return false; 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); $result = $this->db_functions->__dbExecute($stm_name, $data);
if ($result === false) { if ($result === false) {
$this->log->debug('ExecuteData', 'ERROR in STM[' . $stm_name . '|' $this->log->debug('ExecuteData', 'ERROR in STM[' . $stm_name . '|'