Fixing tests and stuff

Author: lonnieezell

system/Commands/Database/Migrate.php

@@ -105,8 +105,8 @@ public function run(array $params = [])
 	{
 		$runner = Services::migrations();
 		$runner->clearCliMessages();
-		
-		CLI::write(lang('Migrations.progress'), 'yellow');
+
+		CLI::write(lang('Migrations.latest'), 'yellow');
 
 		$namespace = $params['-n'] ?? CLI::getOption('n');
 		$group     = $params['-g'] ?? CLI::getOption('g');
@@ -124,7 +124,7 @@ public function run(array $params = [])
 				$runner->setNamespace($namespace);
 			}
 
-			if (! $runner->progress($group))
+			if (! $runner->latest($group))
 			{
 				CLI::write(lang('Migrations.generalFault'), 'red');
 			}

system/Database/MigrationRunner.php

@@ -168,7 +168,7 @@ public function __construct(BaseConfig $config, $db = null)
 	 *
 	 * @param string|null $group
 	 */
-	public function progress(string $group = null)
+	public function latest(string $group = null)
 	{
 		if (! $this->enabled)
 		{

system/Language/en/Migrations.php

@@ -38,7 +38,7 @@
    'writeError'        => 'Error trying to create file.',
    'migNumberError'    => 'Migration number must be three digits, and there must not be any gaps in the sequence.',
 
-   'progress'          => 'Running all new migrations...',
+   'latest'            => 'Running all new migrations...',
    'generalFault'      => 'Migration failed!',
    'migInvalidVersion' => 'Invalid version number provided.',
    'toVersionPH'       => 'Migrating to version %s...',

system/Test/CIDatabaseTestCase.php

@@ -177,23 +177,23 @@ protected function setUp()
 			// Delete all of the tables to ensure we're at a clean start.
 			$tables = $this->db->listTables();
 
-			//          if (is_array($tables))
-			//          {
-			//              $forge = Database::forge('tests');
-			//d($tables);
-			//              foreach ($tables as $table)
-			//              {
-			//                  if ($table === $this->db->DBPrefix . 'migrations')
-			//                  {
-			//                      continue;
-			//                  }
-			//
-			//                  $forge->dropTable($table, true);
-			//              }
-			//          }
+			if (is_array($tables))
+			{
+				$forge = Database::forge('tests');
+
+				foreach ($tables as $table)
+				{
+					if ($table === $this->db->DBPrefix . 'migrations')
+					{
+						continue;
+					}
+
+					$forge->dropTable($table, true);
+				}
+			}
 
 			$this->migrations->regress(0, 'tests');
-			$this->migrations->progress('tests');
+			$this->migrations->latest('tests');
 		}
 
 		if (! empty($this->seed))

tests/system/Database/Migrations/MigrationRunnerTest.php

@@ -193,6 +193,7 @@ public function testFindMigrationsSuccessTimestamp()
 								 'version'   => '2018-01-24-102302',
 								 'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
 								 'namespace' => 'Tests\Support\MigrationTestMigrations',
+								 'uid'       => '2018-01-24-102302Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
 							 ];
 		$mig1->uid = $runner->getObjectUid($mig1);
 
@@ -215,7 +216,7 @@ public function testMigrationThrowsDisabledException()
 
 		$runner->setSilent(false);
 
-		$runner = $runner->setPath($this->start);
+		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
 		vfsStream::copyFromFileSystem(
 			TESTPATH . '_support/MigrationTestMigrations/Database/Migrations',
@@ -225,7 +226,7 @@ public function testMigrationThrowsDisabledException()
 		$this->expectException(ConfigException::class);
 		$this->expectExceptionMessage('Migrations have been loaded but are disabled or setup incorrectly.');
 
-		$runner->progress();
+		$runner->latest();
 	}
 
 	public function testVersionReturnsUpDownSuccess()
@@ -240,7 +241,7 @@ public function testVersionReturnsUpDownSuccess()
 
 		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
-		$runner->progress();
+		$runner->latest();
 		$version = $runner->getBatchEnd($runner->getLastBatch());
 
 		$this->assertEquals('2018-01-24-102302', $version);
@@ -262,7 +263,7 @@ public function testProgressSuccess()
 
 		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
-		$runner->progress();
+		$runner->latest();
 		$version = $runner->getBatchEnd($runner->getLastBatch());
 
 		$this->assertEquals('2018-01-24-102302', $version);
@@ -280,7 +281,7 @@ public function testRegressSuccess()
 		$runner->setSilent(false);
 
 		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
-		$runner->progress();
+		$runner->latest();
 
 		$runner->regress();
 		$version = $runner->getBatchEnd($runner->getLastBatch());
@@ -302,16 +303,17 @@ public function testHistoryRecordsBatches()
 
 		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
-		$runner->progress();
+		$runner->latest();
 		$version = $runner->getBatchEnd($runner->getLastBatch());
 
-		$this->assertEquals('2018-01-24-102301', $version);
+		$this->assertEquals('2018-01-24-102302', $version);
 
 		$history = $runner->getHistory('tests');
+
 		$this->assertEquals(1, $history[0]->batch);
 
 		$this->assertEquals(1, $history[0]->batch);
-		$this->assertEquals(2, $history[1]->batch);
+		$this->assertEquals(1, $history[1]->batch);
 
 		$this->seeInDatabase('migrations', [
 			'batch' => 1,
@@ -328,7 +330,7 @@ public function testGetBatchVersions()
 
 		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
-		$runner->progress();
+		$runner->latest();
 
 		$this->assertEquals('2018-01-24-102301', $runner->getBatchStart(1));
 		$this->assertEquals('2018-01-24-102302', $runner->getBatchEnd(1));

user_guide_src/source/dbmgmt/migration.rst

@@ -10,7 +10,7 @@ need to be run against the production machines next time you deploy.
 
 The database table **migration** tracks which migrations have already been
 run so all you have to do is make sure your migrations are in place and
-call ``$migration->progress()`` to bring the database up to the most recent
+call ``$migration->latest()`` to bring the database up to the most recent
 state. You can also use ``$migration->setNamespace(null)->progess()`` to
 include migrations from all namespaces.
 
@@ -199,6 +199,10 @@ This example will migrate Blog namespace with any new migrations on the test dat
 
     > php spark migrate -g test -n Blog
 
+When using the `-all` option, it will scan through all namespaces attempting to find any migrations that have
+not been ran. These will all be collected and then sorted as a group by date created. This should help
+to minimize any potential conflicts between the main application and any modules.
+
 **rollback**
 
 Rolls back all migrations, taking the database group to a blank slate, effectively migration 0::
@@ -275,15 +279,15 @@ Class Reference
 
 		An array of migration filenames are returned that are found in the **path** property.
 
-	.. php:method:: progress($group)
+	.. php:method:: latest($group)
 
 		:param	mixed	$group: database group name, if null default database group will be used.
 		:returns:	TRUE on success, FALSE on failure
 		:rtype:	bool
 
 		This locates migrations for a namespace (or all namespaces), determines which migrations
 		have not yet been run, and runs them in order of their version (namespaces intermingled).
-		
+
 	.. php:method:: regress($batch, $group)
 
 		:param	mixed	$batch: previous batch to migrate down to; 1+ specifies the batch, 0 reverts all, negative refers to the relative batch (e.g. -3 means "three batches back")