Merge pull request #2019 from codeigniter4/sqlitedropindex

SQLite and Mysql driver additional tests and migration runner test fixes
codeigniter4 · May 21, 2019 · d478c94 · d478c94
2 parents fa575f9 + 7f93048
commit d478c94
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 162 deletions.
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -254,15 +254,15 @@ 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)
 		{
-			// Only include migrations within the scoop
+			// Only include migrations within the scope
 			if (($method === 'up' && $version > $currentVersion && $version <= $targetVersion) || ( $method === 'down' && $version <= $currentVersion && $version > $targetVersion))
 			{
 				$migrationStatus = false;
 				include_once $migration->path;
+
 				// Get namespaced class name
 				$class = $this->namespace . '\Database\Migrations\Migration_' . ($migration->name);
 

diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -9,35 +9,35 @@ public function up()
 
 		// User Table
 		$this->forge->addField([
-			'id'      => [
+			'id'         => [
 				'type'          => 'INTEGER',
 				'constraint'    => 3,
 				$unique_or_auto => true,
 			],
-			'name'    => [
+			'name'       => [
 				'type'       => 'VARCHAR',
 				'constraint' => 80,
 			],
-			'email'   => [
+			'email'      => [
 				'type'       => 'VARCHAR',
 				'constraint' => 100,
 			],
-			'country' => [
+			'country'    => [
 				'type'       => 'VARCHAR',
 				'constraint' => 40,
 			],
-			'deleted' => [
+			'deleted'    => [
 				'type'       => 'TINYINT',
 				'constraint' => 1,
 				'default'    => '0',
 			],
 			'created_at' => [
-				'type'       => 'DATETIME',
-				'null'       => true,
+				'type' => 'DATETIME',
+				'null' => true,
 			],
 			'updated_at' => [
-				'type'       => 'DATETIME',
-				'null'       => true,
+				'type' => 'DATETIME',
+				'null' => true,
 			],
 		]);
 		$this->forge->addKey('id', true);
@@ -58,17 +58,17 @@ public function up()
 				'type' => 'TEXT',
 				'null' => true,
 			],
-			'deleted' => [
+			'deleted'     => [
 				'type'       => 'TINYINT',
 				'constraint' => 1,
 				'default'    => '0',
 			],
-			'created_at' => [
+			'created_at'  => [
 				'type'       => 'INTEGER',
 				'constraint' => 11,
 				'null'       => true,
 			],
-			'updated_at' => [
+			'updated_at'  => [
 				'type'       => 'INTEGER',
 				'constraint' => 11,
 				'null'       => true,
@@ -95,22 +95,22 @@ public function up()
 
 		// Empty Table
 		$this->forge->addField([
-			'id'   => [
+			'id'         => [
 				'type'          => 'INTEGER',
 				'constraint'    => 3,
 				$unique_or_auto => true,
 			],
-			'name' => [
+			'name'       => [
 				'type'       => 'VARCHAR',
 				'constraint' => 40,
 			],
 			'created_at' => [
-				'type'       => 'DATE',
-				'null'       => true,
+				'type' => 'DATE',
+				'null' => true,
 			],
 			'updated_at' => [
-				'type'       => 'DATE',
-				'null'       => true,
+				'type' => 'DATE',
+				'null' => true,
 			],
 		]);
 		$this->forge->addKey('id', true);
@@ -137,11 +137,11 @@ public function up()
 
 	public function down()
 	{
-		$this->forge->dropTable('user');
-		$this->forge->dropTable('job');
-		$this->forge->dropTable('misc');
-		$this->forge->dropTable('empty');
-		$this->forge->dropTable('secondary');
+		$this->forge->dropTable('user', true);
+		$this->forge->dropTable('job', true);
+		$this->forge->dropTable('misc', true);
+		$this->forge->dropTable('empty', true);
+		$this->forge->dropTable('secondary', true);
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/_support/Database/SupportMigrations/001_Some_migration.php b/tests/_support/Database/SupportMigrations/001_Some_migration.php
@@ -19,6 +19,6 @@ public function up()
 
 	public function down()
 	{
-		$this->forge->dropTable('foo');
+		$this->forge->dropTable('foo', true);
 	}
 }