Bug fix for DB\IO

4dev/tests/Debug/CoreLibsDebugSupportTest.php

@@ -460,16 +460,18 @@ final class CoreLibsDebugSupportTest extends TestCase
 	 * Undocumented function
 	 *
 	 * @cover ::getCallerFileLine
-	 * @testWith ["/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/vendor/phpunit/phpunit/src/Framework/TestCase.php:1608"]
+	 * @testWith ["vendor/phpunit/phpunit/src/Framework/TestCase.php:"]
-	 * @testdox getCallerFileLine check if it returns $expected [$_dataName]
+	 * @testdox getCallerFileLine check based on regex /[\w\-\/]/vendor/phpunit/phpunit/src/Framework/TestCase.php:\d+ [$_dataName]
 	 *
 	 * @param  string $expected
 	 * @return void
 	 */
-	public function testGetCallerFileLine(string $expected): void
+	public function testGetCallerFileLine(): void
 	{
-		$this->assertEquals(
+		// regex prefix with path "/../" and then fixed vendor + \d+
-			$expected,
+		$regex = "/^\/[\w\-\/]+\/vendor\/phpunit\/phpunit\/src\/Framework\/TestCase.php:\d+$/";
+		$this->assertMatchesRegularExpression(
+			$regex,
 			Support::getCallerFileLine()
 		);
 	}
@@ -518,11 +520,17 @@ final class CoreLibsDebugSupportTest extends TestCase
 				break;
 			case 11:
 				// add one "run" before "runBare"
+				// array_splice(
+				// 	$expected,
+				// 	7,
+				// 	0,
+				// 	['run']
+				// );
 				array_splice(
 					$expected,
-					7,
 					0,
-					['run']
+					0,
+					['include']
 				);
 				$this->assertEquals(
 					$expected,

4dev/tests/Logging/CoreLibsLoggingLoggingTest.php

@@ -20,7 +20,7 @@ final class CoreLibsLoggingLoggingTest extends TestCase
 	private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
 	private const REGEX_BASE = "\[[\d\-\s\.:]+\]\s{1}" // date
 		. "\[[\w\.]+(:\d+)?\]\s{1}" // host:port
-		. "\[[\w+\.\/]+:\d+\]\s{1}" // folder/file
+		. "\[[\w\-\.\/]+:\d+\]\s{1}" // folder/file
 		. "\[\w+\]\s{1}" // run id
 		. "{[\w\\\\]+(::\w+)?}\s{1}"; // class
 

www/lib/CoreLibs/DB/IO.php

@@ -382,7 +382,7 @@ class IO
 	/** @var array<mixed> */
 	private array $pk_name_table = [];
 	/** @var string internal primary key name, for cross calls in async */
-	private string $pk_name;
+	private string $pk_name = '';
 	/** @var bool if we use RETURNING in the INSERT call */
 	private bool $returning_id = false;
 	/** @var string if a sync is running holds the hash key of the query */
@@ -1267,7 +1267,7 @@ class IO
 					// ONLY insert with set pk name
 					($this->__checkQueryForInsert($this->query, true) && $this->pk_name != 'NULL') ||
 					// insert or update with returning add
-					($this->__checkQueryForInsert($this->query) &&  $this->returning_id)
+					($this->__checkQueryForInsert($this->query) && $this->returning_id)
 				) {
 					$this->__dbSetInsertId(
 						$this->returning_id,