Fix up short name to work with seeding. (#868)

dereuromark · jamisonbryant · web-flow · commit b7d251a2e9a5 · 2025-07-19T23:01:49.000-04:00
* Fix up short name to work with seeding.
* Update src/Util/SchemaTrait.php

Co-authored-by: Jamison Bryant &lt;jamison@bryant.ai&gt;
diff --git a/src/Db/Adapter/AbstractAdapter.php b/src/Db/Adapter/AbstractAdapter.php
@@ -1426,7 +1426,7 @@ public function executeActions(TableMetadata $table, array $actions): void
 
                 default:
                     throw new InvalidArgumentException(
-                        sprintf("Don't know how to execute action: '%s'", get_class($action)),
+                        sprintf("Don't know how to execute action `%s`", get_class($action)),
                     );
             }
         }
diff --git a/src/Db/Adapter/AdapterFactory.php b/src/Db/Adapter/AdapterFactory.php
@@ -75,7 +75,7 @@ public function registerAdapter(string $name, Closure|string $class)
             !($class instanceof Closure || is_subclass_of($class, AdapterInterface::class))
         ) {
             throw new RuntimeException(sprintf(
-                'Adapter class "%s" must implement Migrations\\Db\\Adapter\\AdapterInterface',
+                'Adapter class `%s` must implement `Migrations\\Db\\Adapter\\AdapterInterface`',
                 $class,
             ));
         }
@@ -119,7 +119,7 @@ public function registerWrapper(string $name, string $class)
     {
         if (!is_subclass_of($class, WrapperInterface::class)) {
             throw new RuntimeException(sprintf(
-                'Wrapper class "%s" must implement Migrations\\Db\\Adapter\\WrapperInterface',
+                'Wrapper class `%s` must implement `Migrations\\Db\\Adapter\\WrapperInterface`',
                 $class,
             ));
         }
diff --git a/src/Db/Adapter/MysqlAdapter.php b/src/Db/Adapter/MysqlAdapter.php
@@ -643,7 +643,7 @@ protected function getDropIndexByColumnsInstructions(string $tableName, $columns
         }
 
         throw new InvalidArgumentException(sprintf(
-            "The specified index on columns '%s' does not exist",
+            'The specified index on columns `%s` does not exist',
             implode(',', $columns),
         ));
     }
@@ -667,7 +667,7 @@ protected function getDropIndexByNameInstructions(string $tableName, $indexName)
         }
 
         throw new InvalidArgumentException(sprintf(
-            "The specified index name '%s' does not exist",
+            'The specified index name `%s` does not exist',
             $indexName,
         ));
     }
diff --git a/src/Db/Adapter/PostgresAdapter.php b/src/Db/Adapter/PostgresAdapter.php
@@ -709,7 +709,7 @@ protected function getDropIndexByColumnsInstructions(string $tableName, $columns
         }
 
         throw new InvalidArgumentException(sprintf(
-            "The specified index on columns '%s' does not exist",
+            'The specified index on columns `%s` does not exist',
             implode(',', $columns),
         ));
     }
diff --git a/src/Db/Adapter/SqlserverAdapter.php b/src/Db/Adapter/SqlserverAdapter.php
@@ -702,7 +702,7 @@ protected function getDropIndexByColumnsInstructions(string $tableName, $columns
         }
 
         throw new InvalidArgumentException(sprintf(
-            "The specified index on columns '%s' does not exist",
+            'The specified index on columns `%s` does not exist',
             implode(',', $columns),
         ));
     }
@@ -730,7 +730,7 @@ protected function getDropIndexByNameInstructions(string $tableName, string $ind
         }
 
         throw new InvalidArgumentException(sprintf(
-            "The specified index name '%s' does not exist",
+            'The specified index name `%s` does not exist',
             $indexName,
         ));
     }
diff --git a/src/Migration/Manager.php b/src/Migration/Manager.php
@@ -669,10 +669,13 @@ public function seed(?string $seed = null): void
             }
         } else {
             // run only one seeder
-            if (array_key_exists($seed, $seeds)) {
+            if (array_key_exists($seed . 'Seed', $seeds)) {
+                $seed = $seed . 'Seed';
+                $this->executeSeed($seeds[$seed]);
+            } elseif (array_key_exists($seed, $seeds)) {
                 $this->executeSeed($seeds[$seed]);
             } else {
-                throw new InvalidArgumentException(sprintf('The seed class "%s" does not exist', $seed));
+                throw new InvalidArgumentException(sprintf('The seed `%s` does not exist', $seed));
             }
         }
     }
@@ -825,7 +828,7 @@ function ($phpFile) {
                     ini_set('display_errors', $orig_display_errors_setting);
                     if (!class_exists($class)) {
                         throw new InvalidArgumentException(sprintf(
-                            'Could not find class "%s" in file "%s"',
+                            'Could not find class `%s` in file `%s`',
                             $class,
                             $filePath,
                         ));
@@ -953,7 +956,7 @@ public function getSeeds(): array
                     require_once $filePath;
                     if (!class_exists($class)) {
                         throw new InvalidArgumentException(sprintf(
-                            'Could not find class "%s" in file "%s"',
+                            'Could not find class `%s` in file `%s`',
                             $class,
                             $filePath,
                         ));
diff --git a/src/Util/SchemaTrait.php b/src/Util/SchemaTrait.php
@@ -39,8 +39,8 @@ protected function _getSchema(InputInterface $input, OutputInterface $output): ?
 
         if (!method_exists($connection, 'getSchemaCollection')) {
             $msg = sprintf(
-                'The "%s" connection is not compatible with orm caching, ' .
-                'as it does not implement a "getSchemaCollection()" method.',
+                'The `%s` connection is not compatible with ORM caching, ' .
+                'as it does not implement a `getSchemaCollection()` method.',
                 $connectionName,
             );
             $output->writeln('<error>' . $msg . '</error>');
diff --git a/tests/TestCase/Command/SeedCommandTest.php b/tests/TestCase/Command/SeedCommandTest.php
@@ -112,7 +112,7 @@ public function testBeforeSeederAbort(): void
     public function testSeederUnknown(): void
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The seed class "NotThere" does not exist');
+        $this->expectExceptionMessage('The seed `NotThere` does not exist');
         $this->exec('migrations seed -c test --seed NotThere');
     }
 
@@ -170,7 +170,7 @@ public function testSeederMultipleNotFound(): void
         $this->createTables();
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The seed class "NotThere" does not exist');
+        $this->expectExceptionMessage('The seed `NotThere` does not exist');
         $this->exec('migrations seed -c test --seed NumbersSeed --seed NotThere');
     }
 
@@ -197,7 +197,7 @@ public function testSeederSourceNotFound(): void
     {
         $this->createTables();
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The seed class "LettersSeed" does not exist');
+        $this->expectExceptionMessage('The seed `LettersSeed` does not exist');
 
         $this->exec('migrations seed -c test --source NotThere --seed LettersSeed');
     }
diff --git a/tests/TestCase/Db/Adapter/AdapterFactoryTest.php b/tests/TestCase/Db/Adapter/AdapterFactoryTest.php
@@ -51,7 +51,7 @@ public function testRegisterAdapterFailure()
         $adapter = static::class;
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Adapter class "Migrations\Test\Db\Adapter\AdapterFactoryTest" must implement Migrations\Db\Adapter\AdapterInterface');
+        $this->expectExceptionMessage('Adapter class `Migrations\Test\Db\Adapter\AdapterFactoryTest` must implement `Migrations\Db\Adapter\AdapterInterface`');
 
         $this->factory->registerAdapter('test', $adapter);
     }
@@ -89,7 +89,7 @@ public function testRegisterWrapperFailure()
         $wrapper = static::class;
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Wrapper class "Migrations\Test\Db\Adapter\AdapterFactoryTest" must implement Migrations\Db\Adapter\WrapperInterface');
+        $this->expectExceptionMessage('Wrapper class `Migrations\Test\Db\Adapter\AdapterFactoryTest` must implement `Migrations\Db\Adapter\WrapperInterface`');
 
         $this->factory->registerWrapper('test', $wrapper);
     }
diff --git a/tests/TestCase/Migration/ManagerTest.php b/tests/TestCase/Migration/ManagerTest.php
@@ -2177,7 +2177,7 @@ public function testExecuteANonExistentSeedWorksAsExpected(): void
         $this->manager->setEnvironment($envStub);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The seed class "NonExistentSeeder" does not exist');
+        $this->expectExceptionMessage('The seed `NonExistentSeeder` does not exist');
 
         $this->manager->seed('NonExistentSeeder');
     }
diff --git a/tests/TestCase/MigrationsTest.php b/tests/TestCase/MigrationsTest.php
@@ -959,6 +959,59 @@ public function testSeedOneSeeder($backend)
         $this->migrations->rollback(['target' => 'all']);
     }
 
+    /**
+     * Tests seeding the database with seeder
+     *
+     * @return void
+     */
+    public function testSeedOneSeederShortName()
+    {
+        // This only works for Migrations built in.
+        $backend = 'builtin';
+        Configure::write('Migrations.backend', $backend);
+
+        $this->migrations->migrate();
+
+        $seed = $this->migrations->seed(['source' => 'AltSeeds', 'seed' => 'AnotherNumbers']);
+        $this->assertTrue($seed);
+        $result = $this->Connection->selectQuery()
+            ->select(['*'])
+            ->from('numbers')
+            ->execute()->fetchAll('assoc');
+
+        $expected = [
+            [
+                'id' => '1',
+                'number' => '2',
+                'radix' => '10',
+            ],
+        ];
+        $this->assertEquals($expected, $result);
+
+        $seed = $this->migrations->seed(['source' => 'AltSeeds', 'seed' => 'NumbersAlt']);
+        $this->assertTrue($seed);
+        $result = $this->Connection->selectQuery()
+            ->select(['*'])
+            ->from('numbers')
+            ->execute()->fetchAll('assoc');
+
+        $expected = [
+            [
+                'id' => '1',
+                'number' => '2',
+                'radix' => '10',
+            ],
+            [
+                'id' => '2',
+                'number' => '5',
+                'radix' => '10',
+            ],
+        ];
+        $this->assertEquals($expected, $result);
+
+        $this->migrations->rollback(['target' => 'all']);
+    }
+
     /**
      * Tests seeding the database with seeder
      *
@@ -1034,7 +1087,12 @@ public function testSeedWrongSeed($backend)
         Configure::write('Migrations.backend', $backend);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The seed class "DerpSeed" does not exist');
+        if ($backend === 'builtin') {
+            $this->expectExceptionMessage('The seed `DerpSeed` does not exist');
+        } else {
+            $this->expectExceptionMessage('The seed class "DerpSeed" does not exist');
+        }
+
         $this->migrations->seed(['source' => 'AltSeeds', 'seed' => 'DerpSeed']);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1426,7 +1426,7 @@ public function executeActions(TableMetadata $table, array $actions): void`
`1426`	`1426`
`1427`	`1427`	`default:`
`1428`	`1428`	`throw new InvalidArgumentException(`
`1429`		`- sprintf("Don't know how to execute action: '%s'", get_class($action)),`
	`1429`	+ sprintf("Don't know how to execute action `%s`", get_class($action)),
`1430`	`1430`	`);`
`1431`	`1431`	`}`
`1432`	`1432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function registerAdapter(string $name, Closure\|string $class)`
`75`	`75`	`!($class instanceof Closure \|\| is_subclass_of($class, AdapterInterface::class))`
`76`	`76`	`) {`
`77`	`77`	`throw new RuntimeException(sprintf(`
`78`		`- 'Adapter class "%s" must implement Migrations\\Db\\Adapter\\AdapterInterface',`
	`78`	+ 'Adapter class `%s` must implement `Migrations\\Db\\Adapter\\AdapterInterface`',
`79`	`79`	`$class,`
`80`	`80`	`));`
`81`	`81`	`}`
`@@ -119,7 +119,7 @@ public function registerWrapper(string $name, string $class)`
`119`	`119`	`{`
`120`	`120`	`if (!is_subclass_of($class, WrapperInterface::class)) {`
`121`	`121`	`throw new RuntimeException(sprintf(`
`122`		`- 'Wrapper class "%s" must implement Migrations\\Db\\Adapter\\WrapperInterface',`
	`122`	+ 'Wrapper class `%s` must implement `Migrations\\Db\\Adapter\\WrapperInterface`',
`123`	`123`	`$class,`
`124`	`124`	`));`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ protected function getDropIndexByColumnsInstructions(string $tableName, $columns`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`throw new InvalidArgumentException(sprintf(`
`646`		`- "The specified index on columns '%s' does not exist",`
	`646`	+ 'The specified index on columns `%s` does not exist',
`647`	`647`	`implode(',', $columns),`
`648`	`648`	`));`
`649`	`649`	`}`
`@@ -667,7 +667,7 @@ protected function getDropIndexByNameInstructions(string $tableName, $indexName)`
`667`	`667`	`}`
`668`	`668`
`669`	`669`	`throw new InvalidArgumentException(sprintf(`
`670`		`- "The specified index name '%s' does not exist",`
	`670`	+ 'The specified index name `%s` does not exist',
`671`	`671`	`$indexName,`
`672`	`672`	`));`
`673`	`673`	`}`
Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,7 @@ protected function getDropIndexByColumnsInstructions(string $tableName, $columns`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`throw new InvalidArgumentException(sprintf(`
`712`		`- "The specified index on columns '%s' does not exist",`
	`712`	+ 'The specified index on columns `%s` does not exist',
`713`	`713`	`implode(',', $columns),`
`714`	`714`	`));`
`715`	`715`	`}`
Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ protected function getDropIndexByColumnsInstructions(string $tableName, $columns`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`throw new InvalidArgumentException(sprintf(`
`705`		`- "The specified index on columns '%s' does not exist",`
	`705`	+ 'The specified index on columns `%s` does not exist',
`706`	`706`	`implode(',', $columns),`
`707`	`707`	`));`
`708`	`708`	`}`
`@@ -730,7 +730,7 @@ protected function getDropIndexByNameInstructions(string $tableName, string $ind`
`730`	`730`	`}`
`731`	`731`
`732`	`732`	`throw new InvalidArgumentException(sprintf(`
`733`		`- "The specified index name '%s' does not exist",`
	`733`	+ 'The specified index name `%s` does not exist',
`734`	`734`	`$indexName,`
`735`	`735`	`));`
`736`	`736`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function testBeforeSeederAbort(): void`
`112`	`112`	`public function testSeederUnknown(): void`
`113`	`113`	`{`
`114`	`114`	`$this->expectException(InvalidArgumentException::class);`
`115`		`- $this->expectExceptionMessage('The seed class "NotThere" does not exist');`
	`115`	+ $this->expectExceptionMessage('The seed `NotThere` does not exist');
`116`	`116`	`$this->exec('migrations seed -c test --seed NotThere');`
`117`	`117`	`}`
`118`	`118`
`@@ -170,7 +170,7 @@ public function testSeederMultipleNotFound(): void`
`170`	`170`	`$this->createTables();`
`171`	`171`
`172`	`172`	`$this->expectException(InvalidArgumentException::class);`
`173`		`- $this->expectExceptionMessage('The seed class "NotThere" does not exist');`
	`173`	+ $this->expectExceptionMessage('The seed `NotThere` does not exist');
`174`	`174`	`$this->exec('migrations seed -c test --seed NumbersSeed --seed NotThere');`
`175`	`175`	`}`
`176`	`176`
`@@ -197,7 +197,7 @@ public function testSeederSourceNotFound(): void`
`197`	`197`	`{`
`198`	`198`	`$this->createTables();`
`199`	`199`	`$this->expectException(InvalidArgumentException::class);`
`200`		`- $this->expectExceptionMessage('The seed class "LettersSeed" does not exist');`
	`200`	+ $this->expectExceptionMessage('The seed `LettersSeed` does not exist');
`201`	`201`
`202`	`202`	`$this->exec('migrations seed -c test --source NotThere --seed LettersSeed');`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function testRegisterAdapterFailure()`
`51`	`51`	`$adapter = static::class;`
`52`	`52`
`53`	`53`	`$this->expectException(RuntimeException::class);`
`54`		`- $this->expectExceptionMessage('Adapter class "Migrations\Test\Db\Adapter\AdapterFactoryTest" must implement Migrations\Db\Adapter\AdapterInterface');`
	`54`	+ $this->expectExceptionMessage('Adapter class `Migrations\Test\Db\Adapter\AdapterFactoryTest` must implement `Migrations\Db\Adapter\AdapterInterface`');
`55`	`55`
`56`	`56`	`$this->factory->registerAdapter('test', $adapter);`
`57`	`57`	`}`
`@@ -89,7 +89,7 @@ public function testRegisterWrapperFailure()`
`89`	`89`	`$wrapper = static::class;`
`90`	`90`
`91`	`91`	`$this->expectException(RuntimeException::class);`
`92`		`- $this->expectExceptionMessage('Wrapper class "Migrations\Test\Db\Adapter\AdapterFactoryTest" must implement Migrations\Db\Adapter\WrapperInterface');`
	`92`	+ $this->expectExceptionMessage('Wrapper class `Migrations\Test\Db\Adapter\AdapterFactoryTest` must implement `Migrations\Db\Adapter\WrapperInterface`');
`93`	`93`
`94`	`94`	`$this->factory->registerWrapper('test', $wrapper);`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2177,7 +2177,7 @@ public function testExecuteANonExistentSeedWorksAsExpected(): void`
`2177`	`2177`	`$this->manager->setEnvironment($envStub);`
`2178`	`2178`
`2179`	`2179`	`$this->expectException(InvalidArgumentException::class);`
`2180`		`- $this->expectExceptionMessage('The seed class "NonExistentSeeder" does not exist');`
	`2180`	+ $this->expectExceptionMessage('The seed `NonExistentSeeder` does not exist');
`2181`	`2181`
`2182`	`2182`	`$this->manager->seed('NonExistentSeeder');`
`2183`	`2183`	`}`