Merge pull request #2524 from MGatner/migration-namespace

Restore namespace after regress. Fixes #2474
codeigniter4 · Jan 31, 2020 · d6ed858 · d6ed858
2 parents 6bdf787 + 1ca7672
commit d6ed858
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -305,6 +305,9 @@ public function regress(int $targetBatch = 0, string $group = null)
 			throw new \RuntimeException($message);
 		}
 
+		// Save the namespace to restore it after loading migrations
+		$tmpNamespace = $this->namespace;
+
 		// Get all migrations
 		$this->namespace = null;
 		$allMigrations   = $this->findMigrations();
@@ -366,6 +369,9 @@ public function regress(int $targetBatch = 0, string $group = null)
 			}
 		}
 
+		// Restore the namespace
+		$this->namespace = $tmpNamespace;
+
 		return true;
 	}