feature: only execute numbered files

closes #357

Author: g105b

src/Migration/DevMigrator.php

@@ -62,6 +62,9 @@ public function getMigrationFileList():array {
 		}
 
 		$fileList = glob("$this->path/*.sql");
+		$fileList = array_values(array_filter($fileList, function(string $file):bool {
+			return preg_match("/^\d+.*\.sql$/", basename($file)) === 1;
+		}));
 		sort($fileList);
 		return $fileList;
 	}
@@ -108,7 +111,7 @@ public function checkIntegrity(array $migrationFileList):void {
 	public function extractNumberFromFilename(string $pathName):int {
 		$file = new SplFileInfo($pathName);
 		$filename = $file->getFilename();
-		preg_match("/(\d+)-?.*\.sql/", $filename, $matches);
+		preg_match("/^(\d+)-?.*\.sql$/", $filename, $matches);
 
 		if(!isset($matches[1])) {
 			throw new MigrationFileNameFormatException($filename);

src/Migration/Migrator.php

@@ -118,6 +118,9 @@ public function getMigrationFileList():array {
 		}
 
 		$fileList = glob("$this->path/*.sql");
+		$fileList = array_values(array_filter($fileList, function(string $file):bool {
+			return preg_match("/^\d+.*\.sql$/", basename($file)) === 1;
+		}));
 		sort($fileList);
 		return $fileList;
 	}
@@ -186,7 +189,7 @@ public function checkIntegrity(
 	public function extractNumberFromFilename(string $pathName):int {
 		$file = new SplFileInfo($pathName);
 		$filename = $file->getFilename();
-		preg_match("/(\d+)-?.*\.sql/", $filename, $matches);
+		preg_match("/^(\d+)-?.*\.sql$/", $filename, $matches);
 
 		if(!isset($matches[1])) {
 			throw new MigrationFileNameFormatException($filename);

test/phpunit/Migration/DevMigratorTest.php

@@ -146,4 +146,26 @@ public function testDevMigratorThrowsOnDuplicateSequenceNumbers():void {
 		$this->expectException(MigrationSequenceOrderException::class);
 		$devMigrator->checkFileListOrder($devMigrator->getMigrationFileList());
 	}
+
+	public function testDevMigratorIgnoresNonNumericFilesAndThrowsOnResultingGap():void {
+		$project = $this->createProjectDir();
+		$databasePath = $project . DIRECTORY_SEPARATOR . "dev.sqlite";
+		$settings = $this->createSettings($project, $databasePath);
+		$devPath = $project . DIRECTORY_SEPARATOR . "query" . DIRECTORY_SEPARATOR . "_migration" . DIRECTORY_SEPARATOR . "dev";
+		mkdir($devPath, 0775, true);
+		file_put_contents($devPath . DIRECTORY_SEPARATOR . "001-first.sql", "select 1");
+		file_put_contents($devPath . DIRECTORY_SEPARATOR . "a002-second.sql", "select 1");
+		file_put_contents($devPath . DIRECTORY_SEPARATOR . "003-third.sql", "select 1");
+
+		$devMigrator = new DevMigrator($settings, $devPath);
+		$fileList = $devMigrator->getMigrationFileList();
+
+		self::assertSame([
+			$devPath . DIRECTORY_SEPARATOR . "001-first.sql",
+			$devPath . DIRECTORY_SEPARATOR . "003-third.sql",
+		], $fileList);
+
+		$this->expectException(MigrationSequenceOrderException::class);
+		$devMigrator->checkFileListOrder($fileList);
+	}
 }

test/phpunit/Migration/MigratorTest.php

@@ -154,6 +154,28 @@ public function testCheckFileListOrderOutOfOrder():void {
 		$migrator->checkFileListOrder($outOfOrder);
 	}
 
+	public function testCheckFileListOrderIgnoresNonNumericFilesAndThrowsOnResultingGap():void {
+		$path = $this->getMigrationDirectory();
+		$files = [
+			"001-first.sql",
+			"a002-second.sql",
+			"003-third.sql",
+		];
+		$this->createFiles($files, $path);
+
+		$settings = $this->createSettings($path);
+		$migrator = new Migrator($settings, $path);
+		$actualFileList = $migrator->getMigrationFileList();
+
+		self::assertSame([
+			$path . DIRECTORY_SEPARATOR . "001-first.sql",
+			$path . DIRECTORY_SEPARATOR . "003-third.sql",
+		], $actualFileList);
+
+		$this->expectException(MigrationSequenceOrderException::class);
+		$migrator->checkFileListOrder($actualFileList);
+	}
+
 	/** @dataProvider dataMigrationFileList */
 	public function testCheckIntegrityGood(array $fileList) {
 		$path = $this->getMigrationDirectory();
@@ -531,6 +553,30 @@ public function testNonSqlExtensions(array $fileList) {
 		self::assertNull($exception);
 	}
 
+	public function testPerformMigrationIgnoresNonNumericPrefixedSqlFiles():void {
+		$path = $this->getMigrationDirectory();
+		file_put_contents($path . DIRECTORY_SEPARATOR . "0001-create-test.sql", self::MIGRATION_CREATE);
+		file_put_contents(
+			$path . DIRECTORY_SEPARATOR . "a0002-ignored.sql",
+			"alter table `test` add `ignored_column` varchar(32)"
+		);
+
+		$settings = $this->createSettings($path);
+		$migrator = new Migrator($settings, $path);
+		$migrator->createMigrationTable();
+
+		$actualFileList = $migrator->getMigrationFileList();
+		self::assertSame([
+			$path . DIRECTORY_SEPARATOR . "0001-create-test.sql",
+		], $actualFileList);
+
+		$migrator->performMigration($actualFileList);
+
+		$db = new Database($settings);
+		$result = $db->executeSql("PRAGMA table_info(test);");
+		self::assertCount(2, $result->fetchAll());
+	}
+
 	/** @dataProvider dataMigrationFileList */
 	public function testMigrationThrowsExceptionWhenNoMigrationTable(array $fileList) {
 		$path = $this->getMigrationDirectory();