Merge pull request #7894 from kenjis/fix-migration-db-group

fix: `spark migrate` `-g` option

app/Config/Migrations.php

@@ -25,9 +25,7 @@ class Migrations extends BaseConfig
      *
      * This is the name of the table that will store the current migrations state.
      * When migrations runs it will store in a database table which migration
-     * level the system is at. It then compares the migration level in this
-     * table to the $config['migration_version'] if they are not the same it
-     * will migrate up. This must be set.
+     * files have already been run.
      */
     public string $table = 'migrations';
 

system/Commands/Database/MigrateRollback.php

@@ -58,7 +58,6 @@ class MigrateRollback extends BaseCommand
      */
     protected $options = [
         '-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3',
-        '-g' => 'Set database group',
         '-f' => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment',
     ];
 
@@ -79,11 +78,6 @@ public function run(array $params)
         }
 
         $runner = Services::migrations();
-        $group  = $params['g'] ?? CLI::getOption('g');
-
-        if (is_string($group)) {
-            $runner->setGroup($group);
-        }
 
         try {
             $batch = $params['b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;

system/Database/MigrationRunner.php

@@ -220,9 +220,10 @@ public function latest(?string $group = null)
      *
      * Calls each migration step required to get to the provided batch
      *
-     * @param int $targetBatch Target batch number, or negative for a relative batch, 0 for all
+     * @param int         $targetBatch Target batch number, or negative for a relative batch, 0 for all
+     * @param string|null $group       Deprecated. The designation has no effect.
      *
-     * @return mixed Current batch number on success, FALSE on failure or no migrations are found
+     * @return bool True on success, FALSE on failure or no migrations are found
      *
      * @throws ConfigException
      * @throws RuntimeException
@@ -233,11 +234,6 @@ public function regress(int $targetBatch = 0, ?string $group = null)
             throw ConfigException::forDisabledMigrations();
         }
 
-        // Set database group if not null
-        if ($group !== null) {
-            $this->setGroup($group);
-        }
-
         $this->ensureTable();
 
         $batches = $this->getBatches();

user_guide_src/source/changelogs/v4.4.2.rst

@@ -18,6 +18,11 @@ Message Changes
 Changes
 *******
 
+- **Database Migrations:** The ``-g`` option for the ``spark migrate:rollback``
+  command was removed. It did not work from the beginning. Also, the rollback
+  command returns the database(s) state to a specified batch number and cannot
+  specify only a specific database group.
+
 Deprecations
 ************
 

user_guide_src/source/dbmgmt/migration.rst

@@ -67,9 +67,13 @@ Database Groups
 
 A migration will only be run against a single database group. If you have multiple groups defined in
 **app/Config/Database.php**, then it will run against the ``$defaultGroup`` as specified
-in that same configuration file. There may be times when you need different schemas for different
+in that same configuration file.
+
+There may be times when you need different schemas for different
 database groups. Perhaps you have one database that is used for all general site information, while
-another database is used for mission critical data. You can ensure that migrations are run only
+another database is used for mission critical data.
+
+You can ensure that migrations are run only
 against the proper group by setting the ``$DBGroup`` property on your migration. This name must
 match the name of the database group exactly:
 
@@ -115,8 +119,8 @@ Migrates a database group with all available migrations:
 
 You can use (migrate) with the following options:
 
-- ``-g`` - to chose database group, otherwise default database group will be used.
-- ``-n`` - to choose namespace, otherwise (App) namespace will be used.
+- ``-g`` - to specify database group. If specified, only migrations for the specified database group will be run. If not specified, all migrations will be run.
+- ``-n`` - to choose namespace, otherwise ``App`` namespace will be used.
 - ``--all`` - to migrate all namespaces to the latest migration.
 
 This example will migrate ``Acme\Blog`` namespace with any new migrations on the test database group:
@@ -140,15 +144,14 @@ 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:
+Rolls back all migrations to a blank slate, effectively migration 0:
 
 .. code-block:: console
 
   php spark migrate:rollback
 
 You can use (rollback) with the following options:
 
-- ``-g`` - to choose database group, otherwise default database group will be used.
 - ``-b`` - to choose a batch: natural numbers specify the batch.
 - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment.
 
@@ -163,8 +166,8 @@ Refreshes the database state by first rolling back all migrations, and then migr
 
 You can use (refresh) with the following options:
 
-- ``-g`` - to choose database group, otherwise default database group will be used.
-- ``-n`` - to choose namespace, otherwise (App) namespace will be used.
+- ``-g`` - to specify database group. If specified, only migrations for the specified database group will be run. If not specified, all migrations will be run.
+- ``-n`` - to choose namespace, otherwise ``App`` namespace will be used.
 - ``--all`` - to refresh all namespaces.
 - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment.
 
@@ -189,7 +192,7 @@ Displays a list of all migrations and the date and time they ran, or '--' if the
 
 You can use (status) with the following options:
 
-- ``-g`` - to choose database group, otherwise default database group will be used.
+- ``-g`` - to specify database group. If specified, only migrations for the specified database group will be checked. If not specified, all migrations will be checked.
 
 make:migration
 ==============
@@ -220,13 +223,15 @@ Migration Preferences
 
 The following is a table of all the config options for migrations, available in **app/Config/Migrations.php**.
 
-========================== ====================== ========================== =============================================================
-Preference                 Default                Options                    Description
-========================== ====================== ========================== =============================================================
-**enabled**                true                   true / false               Enable or disable migrations.
-**table**                  migrations             None                       The table name for storing the schema version number.
-**timestampFormat**        Y-m-d-His\_                                       The format to use for timestamps when creating a migration.
-========================== ====================== ========================== =============================================================
+==================== ============ ============= =============================================================
+Preference           Default      Options       Description
+==================== ============ ============= =============================================================
+**enabled**          true         true / false  Enable or disable migrations.
+**table**            migrations   None          The table name for storing the schema version number. This
+                                                table is always created in the default database group
+                                                (``$defaultGroup``).
+**timestampFormat**  Y-m-d-His\_                The format to use for timestamps when creating a migration.
+==================== ============ ============= =============================================================
 
 ***************
 Class Reference