Merge pull request #2137 from MGatner/migration-union

New Migration Logic

Author: lonnieezell

system/Autoloader/FileLocator.php

@@ -126,19 +126,19 @@ public function locateFile(string $file, string $folder = null, string $ext = 'p
 			$filename = implode('/', $segments);
 			break;
 		}
-		
+
 		// if no namespaces matched then quit
 		if (empty($paths))
 		{
 			return false;
 		}
-		
+
 		// Check each path in the namespace
 		foreach ($paths as $path)
 		{
 			// Ensure trailing slash
 			$path = rtrim($path, '/') . '/';
-			
+
 			// If we have a folder name, then the calling function
 			// expects this file to be within that folder, like 'Views',
 			// or 'libraries'.
@@ -153,7 +153,7 @@ public function locateFile(string $file, string $folder = null, string $ext = 'p
 				return $path;
 			}
 		}
-		
+
 		return false;
 	}
 

system/Commands/Database/CreateMigration.php

@@ -123,7 +123,7 @@ public function run(array $params = [])
 
 		if (! empty($ns))
 		{
-			// Get all namespaces form  PSR4 paths.
+			// Get all namespaces from PSR4 paths.
 			$config     = new Autoload();
 			$namespaces = $config->psr4;
 

…stem/Commands/Database/MigrateLatest.php system/Commands/Database/Migrate.phpsystem/Commands/Database/MigrateLatest.php renamed to system/Commands/Database/Migrate.php system/Commands/Database/MigrateLatest.php renamed to system/Commands/Database/Migrate.php

@@ -43,11 +43,11 @@
 use Config\Services;
 
 /**
- * Creates a new migration file.
+ * Runs all new migrations.
  *
  * @package CodeIgniter\Commands
  */
-class MigrateLatest extends BaseCommand
+class Migrate extends BaseCommand
 {
 	/**
 	 * The group the command is lumped under
@@ -69,7 +69,7 @@ class MigrateLatest extends BaseCommand
 	 *
 	 * @var string
 	 */
-	protected $description = 'Migrates the database to the latest schema.';
+	protected $description = 'Locates and runs all new migrations against the database.';
 
 	/**
 	 * the Command's usage
@@ -93,7 +93,7 @@ class MigrateLatest extends BaseCommand
 	protected $options = [
 		'-n'   => 'Set migration namespace',
 		'-g'   => 'Set database group',
-		'-all' => 'Set latest for all namespace, will ignore (-n) option',
+		'-all' => 'Set for all namespaces, will ignore (-n) option',
 	];
 
 	/**
@@ -104,22 +104,31 @@ class MigrateLatest extends BaseCommand
 	public function run(array $params = [])
 	{
 		$runner = Services::migrations();
+		$runner->clearCliMessages();
 
-		CLI::write(lang('Migrations.toLatest'), 'yellow');
+		CLI::write(lang('Migrations.latest'), 'yellow');
 
 		$namespace = $params['-n'] ?? CLI::getOption('n');
 		$group     = $params['-g'] ?? CLI::getOption('g');
 
 		try
 		{
+			// Check for 'all' namespaces
 			if ($this->isAllNamespace($params))
 			{
-				$runner->latestAll($group);
+				$runner->setNamespace(null);
 			}
-			else
+			// Check for a specified namespace
+			elseif ($namespace)
 			{
-				$runner->latest($namespace, $group);
+				$runner->setNamespace($namespace);
 			}
+
+			if (! $runner->latest($group))
+			{
+				CLI::write(lang('Migrations.generalFault'), 'red');
+			}
+
 			$messages = $runner->getCliMessages();
 			foreach ($messages as $message)
 			{

system/Commands/Database/MigrateRefresh.php

@@ -104,7 +104,7 @@ class MigrateRefresh extends BaseCommand
 	 */
 	public function run(array $params = [])
 	{
-		$this->call('migrate:rollback', ['-b' => 1]);
+		$this->call('migrate:rollback', ['-b' => 0]);
 		$this->call('migrate');
 	}
 

system/Commands/Database/MigrateRollback.php

@@ -72,7 +72,7 @@ class MigrateRollback extends BaseCommand
 	 *
 	 * @var string
 	 */
-	protected $description = 'Runs the down method for all migrations in the last batch.';
+	protected $description = 'Runs the "down" method for all migrations in the last batch.';
 
 	/**
 	 * the Command's usage
@@ -94,7 +94,7 @@ class MigrateRollback extends BaseCommand
 	 * @var array
 	 */
 	protected $options = [
-		'-b' => 'Specify a batch to roll back to',
+		'-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3 or "-2" to roll back twice',
 		'-g' => 'Set database group',
 	];
 
@@ -108,8 +108,6 @@ public function run(array $params = [])
 	{
 		$runner = Services::migrations();
 
-		CLI::write(lang('Migrations.rollingBack'), 'yellow');
-
 		$group = $params['-g'] ?? CLI::getOption('g');
 
 		if (! is_null($group))
@@ -119,10 +117,14 @@ public function run(array $params = [])
 
 		try
 		{
-			$batch = $params['-b'] ?? $runner->getLastBatch();
-
-			$runner->version($runner->getBatchStart($batch));
-
+			$batch = $params['-b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;
+			CLI::write(lang('Migrations.rollingBack') . ' ' . $batch, 'yellow');
+			
+			if (! $runner->regress($batch))
+			{
+				CLI::write(lang('Migrations.generalFault'), 'red');
+			}
+			
 			$messages = $runner->getCliMessages();
 			foreach ($messages as $message)
 			{

system/Commands/Database/MigrateStatus.php

@@ -160,17 +160,18 @@ public function run(array $params = [])
 
 			CLI::write('  ' . str_pad(lang('Migrations.filename'), $max + 4) . lang('Migrations.on'), 'yellow');
 
-			foreach ($migrations as $version => $migration)
+			foreach ($migrations as $uid => $migration)
 			{
 				$date = '';
 				foreach ($history as $row)
 				{
-					if ($row['version'] !== $version)
+
+					if ($runner->getObjectUid($row) !== $uid)
 					{
 						continue;
 					}
 
-					$date = date('Y-m-d H:i:s', $row['time']);
+					$date = date('Y-m-d H:i:s', $row->time);
 				}
 				CLI::write(str_pad('  ' . $migration->name, $max + 6) . ($date ? $date : '---'));
 			}