Correct Migration table definition

Author: phpfui

Tests/Unit/MigrationTest.php

@@ -10,17 +10,46 @@ public function testMigrations() : void
 		$tables = \PHPFUI\ORM::getTables();
 		$this->assertContains('migration', $tables);
 		$migrator = new \PHPFUI\ORM\Migrator();
-		$migrator->migrateUpOne();
+		$this->assertEmpty($migrator->getErrors());
+		$this->assertTrue($migrator->migrationNeeded());
+		$this->assertEquals(1, $migrator->migrateUpOne());
+		$this->assertEquals('Migrated to 1 successfully', $migrator->getStatus());
+		$this->assertEmpty($migrator->getErrors());
 		$migrationTable = new \PHPFUI\ORM\Table\Migration();
 		$this->assertCount(1, $migrationTable);
-		$migrator->migrateUpOne();
+		$this->assertEquals(2, $migrator->migrateUpOne());
+		$this->assertEquals('Migrated to 2 successfully', $migrator->getStatus());
+		$this->assertEmpty($migrator->getErrors());
 		$this->assertCount(2, $migrationTable);
-		$migrator->migrateDownOne();
+		$this->assertEquals(1, $migrator->migrateDownOne());
+		$this->assertEquals('Migrated to 1 successfully', $migrator->getStatus());
+		$this->assertEmpty($migrator->getErrors());
 		$this->assertCount(1, $migrationTable);
 		$tables = \PHPFUI\ORM::getTables();
-		$migrator->migrateDownOne();
+		$this->assertEquals(0, $migrator->migrateDownOne());
+		$this->assertEquals('Migrated to 0 successfully', $migrator->getStatus());
+		$this->assertEmpty($migrator->getErrors());
 		$this->assertCount(0, $migrationTable);
-		$migrator->migrate();
+		$this->assertEquals(3, $migrator->migrate());
+		$this->assertEquals('Migrated to 3 successfully', $migrator->getStatus());
+		$this->assertEmpty($migrator->getErrors());
 		$this->assertCount(3, $migrationTable);
+		$this->assertCount(3, $migrator);
+		$this->assertEquals(3, $migrator->getCurrentMigrationId());
+		$this->assertFalse($migrator->migrationNeeded());
+		$migrator->migrateTo(1);
+		$this->assertEquals('Migrated to 1 successfully', $migrator->getStatus());
+		$this->assertEmpty($migrator->getErrors());
+		$this->assertCount(1, $migrationTable);
+		$this->assertCount(3, $migrator->getMigrationObjects(0, 100));
+		$this->assertCount(1, $migrator->getMigrationObjects(0, 1));
+		$this->assertEquals(\Tests\Fixtures\Migration\Migration_1::class, \get_debug_type($migrator->getMigrationObject(1)));
+
+		$migrator->migrateTo(-1);
+		$this->assertCount(1, $migrator->getErrors());
+		$this->assertContains('Negative Migration Id (-1) is invalid', $migrator->getErrors());
+		$migrator->migrateTo(4);
+		$this->assertCount(2, $migrator->getErrors());
+		$this->assertContains('Target migration of 4 does not exist', $migrator->getErrors());
 		}
 	}

composer.json

@@ -17,7 +17,7 @@
         "psr/log": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "<=12.0",
+        "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0",
         "phpfui/phpunit-syntax-coverage": "^1.0",
         "roave/security-advisories": "dev-latest",
         "friendsofphp/php-cs-fixer": "*",

src/PHPFUI/ORM/Migrator.php

@@ -215,7 +215,7 @@ public function migrateTo(int $migrationId) : bool
 			$currentMigrationId = $previous;
 			}
 
-		if ($currentMigrationId == $migrationId)
+		if ($currentMigrationId === $migrationId)
 			{
 			$this->status = "Migrated to {$migrationId} successfully";
 
@@ -237,8 +237,6 @@ public function migrateUpOne() : int
 
 		if (! $migration)
 			{
-			$this->status = "No next migration ({$id})";
-
 			return 0;
 			}
 		$result = $this->runUp($migration);
@@ -270,7 +268,10 @@ private function runDown(\PHPFUI\ORM\Migration $migration) : int
 
 		$highest = $this->migrationTable->getHighest();
 
-		return (int)$highest->migrationId;
+		$id = (int)$highest->migrationId;
+		$this->status = "Migrated to {$id} successfully";
+
+		return $id;
 		}
 
 	/**
@@ -288,6 +289,9 @@ private function runUp(\PHPFUI\ORM\Migration $migration) : int
 		$migrationRecord->migrationId = $migration->id();
 		$migrationRecord->insert();
 
-		return $migration->id();
+		$id = $migrationRecord->migrationId;
+		$this->status = "Migrated to {$id} successfully";
+
+		return $id;
 		}
 	}

src/PHPFUI/ORM/Record/Definition/Migration.php

@@ -3,11 +3,11 @@
 namespace PHPFUI\ORM\Record\Definition;
 
 /**
- * Autogenerated. Do not modify. Modify SQL table, then run oneOffScripts\generateCRUD.php table_name
+ * Autogenerated. Do not modify. Modify SQL table, then generate with \PHPFUI\ORM\Tool\Generate\CRUD class.
  *
- * @property int $migrationId MySQL type int(11)
+ * @property int $migrationId MySQL type int
  * @property \PHPFUI\ORM\Record\Migration $migration related record
- * @property string $ran MySQL type timestamp
+ * @property string $ran MySQL type datetime
  */
 abstract class Migration extends \PHPFUI\ORM\Record
 	{
@@ -26,8 +26,8 @@ public function initFieldDefinitions() : static
 		if (! \count(static::$fields))
 			{
 			static::$fields = [
-				'migrationId' => new \PHPFUI\ORM\FieldDefinition('int(11)', 'int', 11, false, null, ),
-				'ran' => new \PHPFUI\ORM\FieldDefinition('timestamp', 'string', 20, false, null, ),
+				'migrationId' => new \PHPFUI\ORM\FieldDefinition('int', 'int', 0, false, ),
+				'ran' => new \PHPFUI\ORM\FieldDefinition('datetime', 'string', 20, false, 'CURRENT_TIMESTAMP', ),
 			];
 			}