DB\IO params detection fix

publish/last.published

@@ -1 +1 @@
-8.1.0
+8.1.3

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__

src/DB/IO.php

@@ -279,8 +279,20 @@ class IO
 	public const NO_CACHE = 3;
 	/** @var string default hash type */
 	public const ERROR_HASH_TYPE = 'adler32';
+	/**
+	 * @var string regex for params: only stand alone $number allowed
+	 *             never allowed to start with '
+	 *             must be after space/tab, =, (
+	*/
+	public const REGEX_PARAMS = '/[^\'][\s(=](\$[0-9]{1,})/';
 	/** @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';
+	// REGEX_SELECT
+	// REGEX_UPDATE
+	// REGEX INSERT
+	// REGEX_INSERT_UPDATE_DELETE
+	// REGEX_FROM_TABLE
+	// REGEX_INSERT_UPDATE_DELETE_TABLE
 
 	// recommend to set private/protected and only allow setting via method
 	// can bet set from outside
@@ -1017,7 +1029,7 @@ class IO
 	{
 		// search for $1, $2, in the query and push it into the control array
 		// skip counts for same eg $1, $1, $2 = 2 and not 3
-		preg_match_all('/(\$[0-9]{1,})/', $query, $match);
+		preg_match_all(self::REGEX_PARAMS, $query, $match);
 		$placeholder_count = count(array_unique($match[1]));
 		if ($params_count != $placeholder_count) {
 			$this->__dbError(
@@ -1821,7 +1833,7 @@ class IO
 	 * Wrapper for dbReturnParams
 	 *
 	 * @param  string $query      Query string
-	 * @param  int    $cache      reset status: default: USE_CACHE
+	 * @param  int    $cache      reset status: default: NO_CACHE
 	 *                            USE_CACHE/0: normal read from cache on second run
 	 *                            READ_NEW/1: write to cache, clean before new run
 	 *                            CLEAR_CACHE/2: write cache, clean after finished
@@ -1833,7 +1845,7 @@ class IO
 	 */
 	public function dbReturn(
 		string $query,
-		int $cache = self::USE_CACHE,
+		int $cache = self::NO_CACHE,
 		bool $assoc_only = false
 	): array|false {
 		return $this->dbReturnParams($query, [], $cache, $assoc_only);
@@ -1856,7 +1868,7 @@ class IO
 	 *
 	 * @param  string       $query      Query string
 	 * @param  array<mixed> $params     Query parameters
-	 * @param  int          $cache      reset status: default: USE_CACHE
+	 * @param  int          $cache      reset status: default: NO_CACHE
 	 *                                  USE_CACHE/0: normal read from cache on second run
 	 *                                  READ_NEW/1: write to cache, clean before new run
 	 *                                  CLEAR_CACHE/2: write cache, clean after finished
@@ -1868,7 +1880,7 @@ class IO
 	public function dbReturnParams(
 		string $query,
 		array $params = [],
-		int $cache = self::USE_CACHE,
+		int $cache = self::NO_CACHE,
 		bool $assoc_only = false
 	): array|false {
 		$this->__dbErrorReset();
@@ -2588,7 +2600,7 @@ class IO
 			$match = [];
 			// search for $1, $2, in the query and push it into the control array
 			// skip counts for same eg $1, $1, $2 = 2 and not 3
-			preg_match_all('/(\$[0-9]{1,})/', $query, $match);
+			preg_match_all(self::REGEX_PARAMS, $query, $match);
 			$this->prepare_cursor[$stm_name]['count'] = count(array_unique($match[1]));
 			$this->prepare_cursor[$stm_name]['query'] = $query;
 			$result = $this->db_functions->__dbPrepare($stm_name, $query);

test/phpunit/DB/CoreLibsDBIOTest.php

@@ -2142,7 +2142,7 @@ final class CoreLibsDBIOTest extends TestCase
 		return [
 			// *** READ STEP BY STEP
 			// default cache: USE_CACHE
-			'valid select, default cache settings' => [
+			'valid select, default cache settings (NO_CACHE)' => [
 				// 0-3
 				$read_query,
 				null,
@@ -2156,9 +2156,7 @@ final class CoreLibsDBIOTest extends TestCase
 				// check cursor_ext
 				[
 					'cursor' => 'PgSql\Result',
-					'data' => [
-						0 => $row_a,
-					],
+					'data' => [],
 					'field_names' => [
 						'row_int',
 						'uid'
@@ -2173,9 +2171,9 @@ final class CoreLibsDBIOTest extends TestCase
 					'query' => $read_query,
 					'params' => [],
 					'read_rows' => 1,
-					'cache_flag' => \CoreLibs\DB\IO::USE_CACHE,
+					'cache_flag' => \CoreLibs\DB\IO::NO_CACHE,
 					'assoc_flag' => false,
-					'cached' => true,
+					'cached' => false,
 					'finished' => false,
 					'read_finished' => false,
 					'db_read_finished' => false,
@@ -2190,10 +2188,7 @@ final class CoreLibsDBIOTest extends TestCase
 						],
 						'cursor' => [
 							'cursor' => 'PgSql\Result',
-							'data' => [
-								0 => $row_a,
-								1 => $row_b,
-							],
+							'data' => [],
 							'field_names' => [
 								'row_int',
 								'uid'
@@ -2208,9 +2203,9 @@ final class CoreLibsDBIOTest extends TestCase
 							'query' => $read_query,
 							'params' => [],
 							'read_rows' => 2,
-							'cache_flag' => \CoreLibs\DB\IO::USE_CACHE,
+							'cache_flag' => \CoreLibs\DB\IO::NO_CACHE,
 							'assoc_flag' => false,
-							'cached' => true,
+							'cached' => false,
 							'finished' => false,
 							'read_finished' => true,
 							'db_read_finished' => true,
@@ -2221,10 +2216,7 @@ final class CoreLibsDBIOTest extends TestCase
 						'data' => false,
 						'cursor' => [
 							'cursor' => 1,
-							'data' => [
-								0 => $row_a,
-								1 => $row_b,
-							],
+							'data' => [],
 							'field_names' => [
 								'row_int',
 								'uid'
@@ -2239,9 +2231,9 @@ final class CoreLibsDBIOTest extends TestCase
 							'query' => $read_query,
 							'params' => [],
 							'read_rows' => 2,
-							'cache_flag' => \CoreLibs\DB\IO::USE_CACHE,
+							'cache_flag' => \CoreLibs\DB\IO::NO_CACHE,
 							'assoc_flag' => false,
-							'cached' => true,
+							'cached' => false,
 							'finished' => true,
 							'read_finished' => true,
 							'db_read_finished' => true,
@@ -2811,13 +2803,50 @@ final class CoreLibsDBIOTest extends TestCase
 			],
 			// *** READ AS LOOP
 			// from here on a complex read all full tests
-			'valid select, full read DEFAULT CACHE' => [
+			'valid select, full read, default cache settings (NO CACHE)' => [
 				$read_query,
 				null,
 				null,
 				null,
 				[$row_a, $row_b,],
 				false,
+				[
+					'cursor' => 1,
+					'data' => [],
+					'field_names' => [
+						'row_int',
+						'uid'
+					],
+					'field_types' => [
+						'int4',
+						'varchar'
+					],
+					'num_fields' => 2,
+					'num_rows' => 2,
+					'pos' => 0,
+					'query' => $read_query,
+					'params' => [],
+					'read_rows' => 2,
+					'cache_flag' => \CoreLibs\DB\IO::NO_CACHE,
+					'assoc_flag' => false,
+					'cached' => false,
+					'finished' => true,
+					'read_finished' => true,
+					'db_read_finished' => true,
+				],
+				[],
+				'',
+				'',
+				$insert_query
+			],
+			// USE CACHE
+			'valid select, full read, USE CACHE' => [
+				$read_query,
+				null,
+				\CoreLibs\DB\IO::USE_CACHE,
+				null,
+				[$row_a, $row_b,],
+				false,
 				[
 					'cursor' => 1,
 					'data' => [
@@ -2851,7 +2880,7 @@ final class CoreLibsDBIOTest extends TestCase
 				$insert_query
 			],
 			// READ_NEW
-			'valid select, full read READ NEW' => [
+			'valid select, full read, READ NEW' => [
 				$read_query,
 				null,
 				\CoreLibs\DB\IO::READ_NEW,
@@ -2891,7 +2920,7 @@ final class CoreLibsDBIOTest extends TestCase
 				$insert_query
 			],
 			// CLEAR_CACHE
-			'valid select, full read CLEAR CACHE' => [
+			'valid select, full read, CLEAR CACHE' => [
 				$read_query,
 				null,
 				\CoreLibs\DB\IO::CLEAR_CACHE,
@@ -2928,7 +2957,7 @@ final class CoreLibsDBIOTest extends TestCase
 				'',
 				$insert_query
 			],
-			'valid select, full read NO CACHE' => [
+			'valid select, full read, NO CACHE' => [
 				$read_query,
 				null,
 				\CoreLibs\DB\IO::NO_CACHE,
@@ -3070,7 +3099,7 @@ final class CoreLibsDBIOTest extends TestCase
 	 * @covers ::dbCursorPos
 	 * @covers ::dbCursorNumRows
 	 * @dataProvider dbReturnProvider
-	 * @testdox dbReturn Read Frist $read_first_only only and cache $flag_cache and assoc $flag_assoc with (Warning: $warning/Error: $error) [$_dataName]
+	 * @testdox dbReturn Read First $read_first_only only and cache $flag_cache and assoc $flag_assoc with (Warning: $warning/Error: $error) [$_dataName]
 	 *
 	 * @param string $query
 	 * @param array<mixed>|null $params
@@ -4358,7 +4387,7 @@ final class CoreLibsDBIOTest extends TestCase
 		// NOTE if there are different INSERTS before the primary keys
 		// will not match anymore. Must be updated by hand
 		// IMPORTANT: if this is stand alone the primary key will not match and fail
-		$table_with_primary_key_id = 66;
+		$table_with_primary_key_id = 68;
 		// 0: query + returning
 		// 1: params
 		// 1: pk name for db exec