test(Database): fix state leaks and random-order test determinism for MySQLi, PostgreSQL, and OCI8

system/Database/OCI8/Connection.php

@@ -150,6 +150,17 @@ public function connect(bool $persistent = false)
             : $func($this->username, $this->password, $this->DSN, $this->charset);
     }
 
+    public function initialize()
+    {
+        parent::initialize();
+
+        if ($this->connID) {
+            $this->simpleQuery("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+            $this->simpleQuery("ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+            $this->simpleQuery("ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+        }
+    }
+
     /**
      * Close the database connection.
      *
@@ -422,7 +433,7 @@ protected function _indexData(string $table): array
             $retVal[$row->INDEX_NAME]         = new stdClass();
             $retVal[$row->INDEX_NAME]->name   = $row->INDEX_NAME;
             $retVal[$row->INDEX_NAME]->fields = [$row->COLUMN_NAME];
-            $retVal[$row->INDEX_NAME]->type   = $constraintTypes[$row->CONSTRAINT_TYPE] ?? 'INDEX';
+            $retVal[$row->INDEX_NAME]->type   = $constraintTypes[$row->CONSTRAINT_TYPE ?? ''] ?? 'INDEX';
         }
 
         return $retVal;

tests/system/Database/Live/ConnectTest.php

@@ -46,19 +46,28 @@ protected function setUp(): void
         $this->group2['DBDriver'] = 'Postgre';
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->setPrivateProperty(Database::class, 'instances', []);
+    }
+
     public function testConnectWithMultipleCustomGroups(): void
     {
+        $this->group1['DBPrefix'] = uniqid('g1_', true);
+        $this->group2['DBPrefix'] = uniqid('g2_', true);
+
         // We should have our test database connection already.
-        $instances = $this->getPrivateProperty(Database::class, 'instances');
-        $this->assertCount(1, $instances);
+        $instances    = $this->getPrivateProperty(Database::class, 'instances');
+        $initialCount = count($instances);
 
         $db1 = Database::connect($this->group1);
         $db2 = Database::connect($this->group2);
 
         $this->assertNotSame($db1, $db2);
 
         $instances = $this->getPrivateProperty(Database::class, 'instances');
-        $this->assertCount(3, $instances);
+        $this->assertCount($initialCount + 2, $instances);
     }
 
     public function testConnectReturnsProvidedConnection(): void

tests/system/Database/Live/ExecuteLogMessageFormatTest.php

@@ -60,11 +60,18 @@ public function testLogMessageWhenExecuteFailsShowFullStructuredBacktrace(): voi
 
         if ($db->DBDriver === 'Postgre') {
             $messageFromLogs = array_slice($messageFromLogs, 2);
-        } elseif ($db->DBDriver === 'OCI8') {
-            $messageFromLogs = array_slice($messageFromLogs, 1);
         }
 
-        $this->assertMatchesRegularExpression('/^in \S+ on line \d+\.$/', array_shift($messageFromLogs));
+        $inLine = null;
+
+        while (($line = array_shift($messageFromLogs)) !== null) {
+            if (preg_match('/^in \S+ on line \d+\.$/', $line)) {
+                $inLine = $line;
+                break;
+            }
+        }
+
+        $this->assertNotNull($inLine, 'Could not find "in ... on line ..." in log message');
 
         foreach ($messageFromLogs as $line) {
             $this->assertMatchesRegularExpression('/^\s*\d* .+(?:\(\d+\))?: \S+(?:(?:\->|::)\S+)?\(.*\)$/', $line);

tests/system/Database/Live/ForgeTest.php

@@ -36,25 +36,65 @@ final class ForgeTest extends CIUnitTestCase
     protected $seed    = CITestSeeder::class;
     private Forge $forge;
 
+    private function dropAllMockTables(): void
+    {
+        $tablesToDrop = [
+            'forge_test_invoices',
+            'forge_test_inv',
+            'forge_test_users',
+            'actions',
+            'forge_test_table',
+            'test_exists',
+            'forge_test_attributes',
+            'forge_array_constraint',
+            'forge_nullable_table',
+            'forge_test_1',
+            'forge_test_two',
+            'forge_test_three',
+            'forge_test_four',
+            'forge_test_modify',
+            'droptest',
+            'key_test_users',
+            'test_stores',
+            'user2',
+            'forge_test_table_dummy',
+        ];
+
+        foreach ($tablesToDrop as $table) {
+            $this->forge->dropTable($table, true);
+        }
+    }
+
     protected function setUp(): void
     {
         $this->forge = Database::forge($this->DBGroup);
 
-        // when running locally if one of these tables isn't dropped it may cause error
-        $this->forge->dropTable('forge_test_invoices', true);
-        $this->forge->dropTable('forge_test_inv', true);
-        $this->forge->dropTable('forge_test_users', true);
-        $this->forge->dropTable('actions', true);
+        $this->dropAllMockTables();
+
+        db_connect($this->DBGroup)->resetDataCache();
 
         parent::setUp();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->dropAllMockTables();
+        self::$doneMigration = false;
+    }
+
     public function testCreateDatabase(): void
     {
         if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support create database.');
         }
 
+        try {
+            $this->forge->dropDatabase('test_forge_database');
+        } catch (DatabaseException) {
+            // Ignore if doesn't exist
+        }
+
         $databaseCreated = $this->forge->createDatabase('test_forge_database');
 
         $this->assertTrue($databaseCreated);
@@ -68,14 +108,20 @@ public function testCreateDatabaseWithDots(): void
 
         $dbName = 'test_com.sitedb.web';
 
+        try {
+            $this->forge->dropDatabase($dbName);
+        } catch (DatabaseException) {
+            // Ignore if doesn't exist
+        }
+
         $databaseCreated = $this->forge->createDatabase($dbName);
 
         $this->assertTrue($databaseCreated);
 
         // Checks if tableExists() works.
         $config             = config(Database::class)->{$this->DBGroup};
         $config['database'] = $dbName;
-        $db                 = db_connect($config);
+        $db                 = db_connect($config, false);
         $result             = $db->tableExists('not_exist');
 
         $this->assertFalse($result);
@@ -151,6 +197,12 @@ public function testDropDatabase(): void
             $this->markTestSkipped('SQLite3 requires file path to drop database');
         }
 
+        try {
+            $this->forge->createDatabase('test_forge_database');
+        } catch (DatabaseException) {
+            // Ignore if exists
+        }
+
         $databaseDropped = $this->forge->dropDatabase('test_forge_database');
 
         $this->assertTrue($databaseDropped);

tests/system/Database/Live/GetVersionTest.php

@@ -36,7 +36,6 @@ public function testGetVersion(): void
         $this->db->connID = false;
 
         $version = $this->db->getVersion();
-
-        $this->assertMatchesRegularExpression('/\A\d+(\.\d+)*\z/', $version);
+        $this->assertMatchesRegularExpression('/\A\d+(\.\d+)*/', $version);
     }
 }

tests/system/Database/Live/MetadataTest.php

@@ -120,12 +120,10 @@ public function testListTablesConstrainedByPrefixReturnsOnlyTablesWithMatchingPr
 
     public function testListTablesConstrainedByExtraneousPrefixReturnsOnlyTheExtraneousTable(): void
     {
-        $oldPrefix = '';
+        $oldPrefix = $this->db->getPrefix();
 
         try {
             $this->createExtraneousTable();
-
-            $oldPrefix = $this->db->getPrefix();
             $this->db->setPrefix('tmp_');
 
             $tables = $this->db->listTables(true);

tests/system/Database/Live/MySQLi/FoundRowsTest.php

@@ -54,7 +54,7 @@ public function testEnableFoundRows(): void
     {
         $this->tests['foundRows'] = true;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $this->assertTrue($db1->foundRows);
     }
@@ -63,7 +63,7 @@ public function testDisableFoundRows(): void
     {
         $this->tests['foundRows'] = false;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $this->assertFalse($db1->foundRows);
     }
@@ -72,7 +72,7 @@ public function testAffectedRowsAfterEnableFoundRowsWithNoChange(): void
     {
         $this->tests['foundRows'] = true;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $db1->table('db_user')
             ->set('country', 'US')
@@ -88,7 +88,7 @@ public function testAffectedRowsAfterDisableFoundRowsWithNoChange(): void
     {
         $this->tests['foundRows'] = false;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $db1->table('db_user')
             ->set('country', 'US')
@@ -104,7 +104,7 @@ public function testAffectedRowsAfterEnableFoundRowsWithChange(): void
     {
         $this->tests['foundRows'] = true;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $db1->table('db_user')
             ->set('country', 'NZ')
@@ -120,7 +120,7 @@ public function testAffectedRowsAfterDisableFoundRowsWithChange(): void
     {
         $this->tests['foundRows'] = false;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $db1->table('db_user')
             ->set('country', 'NZ')
@@ -136,7 +136,7 @@ public function testAffectedRowsAfterEnableFoundRowsWithPartialChange(): void
     {
         $this->tests['foundRows'] = true;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $db1->table('db_user')
             ->set('name', 'Derek Jones')
@@ -152,7 +152,7 @@ public function testAffectedRowsAfterDisableFoundRowsWithPartialChange(): void
     {
         $this->tests['foundRows'] = false;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         $db1->table('db_user')
             ->set('name', 'Derek Jones')

tests/system/Database/Live/MySQLi/NumberNativeTest.php

@@ -44,7 +44,7 @@ public function testEnableNumberNative(): void
     {
         $this->tests['numberNative'] = true;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         if ($db1->DBDriver !== 'MySQLi') {
             $this->markTestSkipped('Only MySQLi can complete this test.');
@@ -57,7 +57,7 @@ public function testDisableNumberNative(): void
     {
         $this->tests['numberNative'] = false;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         if ($db1->DBDriver !== 'MySQLi') {
             $this->markTestSkipped('Only MySQLi can complete this test.');
@@ -70,7 +70,7 @@ public function testQueryDataAfterEnableNumberNative(): void
     {
         $this->tests['numberNative'] = true;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         if ($db1->DBDriver !== 'MySQLi') {
             $this->markTestSkipped('Only MySQLi can complete this test.');
@@ -88,7 +88,7 @@ public function testQueryDataAfterDisableNumberNative(): void
     {
         $this->tests['numberNative'] = false;
 
-        $db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests, false);
 
         if ($db1->DBDriver !== 'MySQLi') {
             $this->markTestSkipped('Only MySQLi can complete this test.');

tests/system/Database/Live/Postgre/ConnectTest.php

@@ -47,7 +47,7 @@ public function testShowErrorMessageWhenSettingInvalidCharset(): void
         $group  = $config->tests;
         // Sets invalid charset.
         $group['charset'] = 'utf8mb4';
-        $db               = Database::connect($group);
+        $db               = Database::connect($group, false);
 
         // Actually connect to DB.
         $db->initialize();

tests/system/Database/Live/WorkerModeTest.php

@@ -30,7 +30,6 @@ final class WorkerModeTest extends CIUnitTestCase
     protected function tearDown(): void
     {
         parent::tearDown();
-
         $this->setPrivateProperty(Config::class, 'instances', []);
     }
 

tests/system/Database/Migrations/MigrationRunnerTest.php

@@ -69,9 +69,7 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
-        // To delete data with `$this->regressDatabase()`, set it true.
-        $this->migrate = true;
-        $this->regressDatabase();
+        $this->resetTables();
     }
 
     public function testLoadsDefaultDatabaseWhenNoneSpecified(): void