Fixing tests for Mysql databases

Author: lonnieezell

system/Database/MigrationRunner.php

@@ -254,7 +254,6 @@ public function version(string $targetVersion, string $namespace = null, string
 		$this->checkMigrations($migrations, $method, $targetVersion);
 
 		// loop migration for each namespace (module)
-
 		$migrationStatus = false;
 		foreach ($migrations as $version => $migration)
 		{
@@ -263,6 +262,7 @@ public function version(string $targetVersion, string $namespace = null, string
 			{
 				$migrationStatus = false;
 				include_once $migration->path;
+
 				// Get namespaced class name
 				$class = $this->namespace . '\Database\Migrations\Migration_' . ($migration->name);
 

tests/system/Database/Live/ForgeTest.php

@@ -724,6 +724,11 @@ public function testDropTableSuccess()
 
 		$this->forge->dropTable('droptest', true);
 
-		$this->assertCount(0, $this->db->getIndexData('droptest'));
+		$this->assertFalse($this->db->tableExists('dropTest'));
+
+		if ($this->db->DBDriver === 'SQLite3')
+		{
+			$this->assertCount(0, $this->db->getIndexData('droptest'));
+		}
 	}
 }

tests/system/Database/Migrations/MigrationRunnerTest.php

@@ -279,13 +279,17 @@ public function testVersionWithNoClassInFile()
 
 		vfsStream::newFile('001_some_migration.php')->at($this->root);
 
-		$version = $runner->version(0);
+		$version = $runner->version(1);
 
 		$this->assertFalse($version);
 	}
 
 	public function testVersionReturnsUpDownSuccess()
 	{
+		$forge = \Config\Database::forge();
+		$forge->dropTable('migrations', true);
+		$forge->dropTable('foo', true);
+
 		$config       = $this->config;
 		$config->type = 'sequential';
 		$runner       = new MigrationRunner($config);
@@ -298,15 +302,15 @@ public function testVersionReturnsUpDownSuccess()
 			$this->root
 		);
 
-		$version = $runner->version(1);
+		$version = $runner->version('001');
 
 		$this->assertEquals('001', $version);
 		$this->seeInDatabase('foo', ['key' => 'foobar']);
 
 		$version = $runner->version(0);
 
 		$this->assertEquals('000', $version);
-		$this->assertFalse(db_connect()->tableExists('foo'));
+		$this->assertFalse($this->db->tableExists('foo'));
 	}
 
 	public function testLatestSuccess()