Fix renamed db wait command

Author: davegaeddert

plain-dev/plain/dev/core.py

@@ -151,7 +151,7 @@ def run(self) -> int:
         if find_spec("plain.models"):
             click.secho("→ Waiting for database... ", dim=True, nl=False)
             subprocess.run(
-                [sys.executable, "-m", "plain", "models", "db-wait"],
+                [sys.executable, "-m", "plain", "db", "wait"],
                 env=self.plain_env,
                 check=True,
             )

plain-dev/plain/dev/precommit/cli.py

@@ -126,8 +126,8 @@ def plain_db_connected() -> bool:
     result = subprocess.run(
         [
             "plain",
-            "models",
-            "show-migrations",
+            "migrations",
+            "list",
         ],
         stdout=subprocess.DEVNULL,
         stderr=subprocess.DEVNULL,

plain-jobs/plain/jobs/migrations/0004_rename_tables_to_plainjobs.py

@@ -2,10 +2,10 @@
 #
 # If upgrading from plain.worker, run this SQL command BEFORE running migrations:
 #
-# plain models db-shell -- -c "INSERT INTO plainmigrations (app, name, applied) SELECT 'plainjobs', name, applied FROM plainmigrations WHERE app = 'plainworker' ON CONFLICT DO NOTHING;"
+# plain db shell -- -c "INSERT INTO plainmigrations (app, name, applied) SELECT 'plainjobs', name, applied FROM plainmigrations WHERE app = 'plainworker' ON CONFLICT DO NOTHING;"
 #
 # Then run: plain migrate
-# Then run: plain migrate --prune (to clean up old plainworker records)
+# Then run: plain migrations prune (to clean up old plainworker records)
 #
 # Step 1: Rename tables from plainworker_* to plainjobs_*
 

plain-models/plain/models/README.md

@@ -125,7 +125,7 @@ plain makemigrations
 plain migrate
 
 # See migration status
-plain models show-migrations
+plain migrations list
 ```
 
 Migrations are Python files that describe database schema changes. They're stored in your app's `migrations/` directory.

plain-models/plain/models/preflight.py

@@ -231,7 +231,9 @@ def run(self) -> list[PreflightResult]:
         unknown_tables.discard("plainmigrations")  # Know this could be there
         if unknown_tables:
             table_names = ", ".join(unknown_tables)
-            specific_fix = f'echo "DROP TABLE IF EXISTS {unknown_tables.pop()}" | plain models db-shell'
+            specific_fix = (
+                f'echo "DROP TABLE IF EXISTS {unknown_tables.pop()}" | plain db shell'
+            )
             errors.append(
                 PreflightResult(
                     fix=f"Unknown tables in default database: {table_names}. "
@@ -311,9 +313,7 @@ def run(self) -> list[PreflightResult]:
                 orphaned_list += f" (and {len(prunable_orphaned) - 3} more)"
             message_parts.append(f"From removed packages: {orphaned_list}.")
 
-        message_parts.append(
-            "Run 'plain models prune-migrations' to review and remove them."
-        )
+        message_parts.append("Run 'plain migrations prune' to review and remove them.")
 
         errors.append(
             PreflightResult(