Rename db command to migrate for clarity

- db → migrate (run, status, baseline)
- Add command shortcuts table to README
- Update examples to use new command names

Author: max-lt

README.md

@@ -41,6 +41,23 @@ ow alias rm old-alias
 
 On first run, a `default` alias pointing to `https://dash.openworkers.com/api/v1` is created as default.
 
+## Command Shortcuts
+
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `workers list` | `workers ls` | List all workers |
+| `workers delete` | `workers rm` | Delete a worker |
+| `env list` | `env ls` | List environments |
+| `env delete` | `env rm` | Delete environment |
+| `kv list` | `kv ls` | List KV namespaces |
+| `kv delete` | `kv rm` | Delete KV namespace |
+| `storage list` | `storage ls` | List storage configs |
+| `storage delete` | `storage rm` | Delete storage config |
+| `databases list` | `databases ls` | List databases |
+| `databases delete` | `databases rm` | Delete database |
+| `alias list` | `alias ls` | List aliases |
+| `alias remove` | `alias rm` | Remove alias |
+
 ## Commands
 
 ### Login
@@ -170,19 +187,19 @@ ow databases create my-pg --provider postgres \
 ow databases delete my-db
 ```
 
-### Infra
+### Migrations
 
-Database migrations (requires `db` type alias).
+Database schema migrations (requires `db` type alias).
 
 ```bash
-# Run pending migrations
-ow infra db migrate
-
 # Check migration status
-ow infra db status
+ow local migrate status
+
+# Run pending migrations
+ow local migrate run
 
 # Baseline existing database (mark all migrations as applied)
-ow infra db baseline
+ow local migrate baseline
 ```
 
 ### Using Aliases
@@ -194,7 +211,7 @@ ow workers list
 # Use specific alias as first argument
 ow prod workers list
 ow dev workers get my-api
-ow infra db migrate
+ow local migrate run
 
 # Or use --alias flag
 ow --alias prod workers list
@@ -217,9 +234,10 @@ ow --alias prod workers list
       "url": "http://localhost:7000",
       "token": "ow_xxx"
     },
-    "infra": {
+    "local": {
       "type": "db",
-      "database_url": "postgres://user:pass@host/db"
+      "database_url": "postgres://user:pass@host/db",
+      "user": "admin@example.com"
     }
   }
 }

src/commands/db.rs src/commands/migrate.rssrc/commands/db.rs renamed to src/commands/migrate.rs

@@ -8,7 +8,7 @@ use sqlx::{PgPool, Row};
 static MIGRATOR: Migrator = sqlx::migrate!();
 
 #[derive(Debug, thiserror::Error)]
-pub enum DbError {
+pub enum MigrateError {
     #[error("Config error: {0}")]
     Config(#[from] ConfigError),
 
@@ -18,54 +18,62 @@ pub enum DbError {
     #[error("Migration error: {0}")]
     Migrate(#[from] sqlx::migrate::MigrateError),
 
-    #[error("Alias '{0}' is not a database alias. Use --db or configure a db alias.")]
+    #[error("Alias '{0}' is not a database alias. Use --db when creating the alias.")]
     NotDbAlias(String),
 
     #[error("No alias specified and no default alias configured")]
     NoAlias,
 }
 
 #[derive(Subcommand)]
-pub enum DbCommand {
-    /// Run pending migrations
-    Migrate,
+pub enum MigrateCommand {
+    /// Run all pending migrations
+    #[command(after_help = "Example:\n  ow local migrate run")]
+    Run,
 
-    /// Show migration status
+    /// Show which migrations are applied or pending
+    #[command(after_help = "Example:\n  ow local migrate status")]
     Status,
 
-    /// Mark all migrations as applied without running them (for existing databases)
+    /// Mark all migrations as applied without running them
+    #[command(
+        after_help = "Use this for existing databases that already have the schema.\n\n\
+        Example:\n  ow local migrate baseline"
+    )]
     Baseline,
 }
 
-impl DbCommand {
-    pub async fn run(self, alias: Option<String>) -> Result<(), DbError> {
+impl MigrateCommand {
+    pub async fn run(self, alias: Option<String>) -> Result<(), MigrateError> {
         let database_url = resolve_database_url(alias)?;
         let pool = connect(&database_url).await?;
 
         match self {
-            Self::Migrate => cmd_migrate(&pool).await,
+            Self::Run => cmd_run(&pool).await,
             Self::Status => cmd_status(&pool).await,
             Self::Baseline => cmd_baseline(&pool).await,
         }
     }
 }
 
-fn resolve_database_url(alias: Option<String>) -> Result<String, DbError> {
+fn resolve_database_url(alias: Option<String>) -> Result<String, MigrateError> {
     let config = Config::load()?;
 
-    let alias_name = alias.or(config.default.clone()).ok_or(DbError::NoAlias)?;
+    let alias_name = alias
+        .or(config.default.clone())
+        .ok_or(MigrateError::NoAlias)?;
 
     let alias_config = config
         .get_alias(&alias_name)
         .ok_or_else(|| ConfigError::AliasNotFound(alias_name.clone()))?;
 
     match alias_config {
         AliasConfig::Db { database_url, .. } => Ok(database_url.clone()),
-        AliasConfig::Api { .. } => Err(DbError::NotDbAlias(alias_name)),
+        AliasConfig::Api { .. } => Err(MigrateError::NotDbAlias(alias_name)),
     }
 }
 
-async fn connect(database_url: &str) -> Result<PgPool, DbError> {
+async fn connect(database_url: &str) -> Result<PgPool, MigrateError> {
     let pool = PgPoolOptions::new()
         .max_connections(1)
         .connect(database_url)
@@ -74,7 +82,7 @@ async fn connect(database_url: &str) -> Result<PgPool, DbError> {
     Ok(pool)
 }
 
-async fn cmd_migrate(pool: &PgPool) -> Result<(), DbError> {
+async fn cmd_run(pool: &PgPool) -> Result<(), MigrateError> {
     println!("Running migrations...\n");
 
     MIGRATOR.run(pool).await?;
@@ -84,7 +92,7 @@ async fn cmd_migrate(pool: &PgPool) -> Result<(), DbError> {
     Ok(())
 }
 
-async fn cmd_status(pool: &PgPool) -> Result<(), DbError> {
+async fn cmd_status(pool: &PgPool) -> Result<(), MigrateError> {
     // Get applied migrations from DB
     let applied: Vec<(i64, Vec<u8>)> =
         sqlx::query("SELECT version, checksum FROM _sqlx_migrations ORDER BY version")
@@ -135,14 +143,14 @@ async fn cmd_status(pool: &PgPool) -> Result<(), DbError> {
         println!(
             "{} pending migration(s). Run '{}' to apply.",
             pending_count.to_string().yellow(),
-            "ow db migrate".cyan()
+            "ow migrate run".cyan()
         );
     }
 
     Ok(())
 }
 
-async fn cmd_baseline(pool: &PgPool) -> Result<(), DbError> {
+async fn cmd_baseline(pool: &PgPool) -> Result<(), MigrateError> {
     // Create _sqlx_migrations table if it doesn't exist
     sqlx::query(
         r#"
@@ -170,7 +178,7 @@ async fn cmd_baseline(pool: &PgPool) -> Result<(), DbError> {
             "Warning:".yellow().bold(),
             count
         );
-        println!("Use '{}' to check status.", "ow db status".cyan());
+        println!("Use '{}' to check status.", "ow migrate status".cyan());
         return Ok(());
     }
 

src/commands/mod.rs

@@ -1,8 +1,8 @@
 pub mod alias;
 pub mod databases;
-pub mod db;
 pub mod env;
 pub mod kv;
 pub mod login;
+pub mod migrate;
 pub mod storage;
 pub mod workers;

src/main.rs

@@ -12,9 +12,9 @@ use backend::api::ApiBackend;
 use backend::db::DbBackend;
 use commands::alias::AliasCommand;
 use commands::databases::DatabasesCommand;
-use commands::db::DbCommand;
 use commands::env::EnvCommand;
 use commands::kv::KvCommand;
+use commands::migrate::MigrateCommand;
 use commands::storage::StorageCommand;
 use commands::workers::WorkersCommand;
 use config::{AliasConfig, Config, PlatformStorageConfig};
@@ -77,13 +77,13 @@ enum Commands {
         ow prod login      Login to 'prod' alias")]
     Login,
 
-    /// Direct database operations (requires db alias with --user)
+    /// Run database migrations (requires db alias)
     #[command(after_help = "Examples:\n  \
-        ow local db migrate    Run migrations\n  \
-        ow local db seed       Seed initial data")]
-    Db {
+        ow local migrate status    Show migration status\n  \
+        ow local migrate run       Run pending migrations")]
+    Migrate {
         #[command(subcommand)]
-        command: DbCommand,
+        command: MigrateCommand,
     },
 
     /// Create, deploy, and manage workers
@@ -189,7 +189,7 @@ fn extract_alias_from_args() -> (Option<String>, Vec<String>) {
     let known_commands = [
         "alias",
         "login",
-        "db",
+        "migrate",
         "workers",
         "env",
         "storage",
@@ -469,7 +469,7 @@ async fn main() {
                 .ok_or("No alias specified and no default configured".to_string())?;
             commands::login::run(&alias_name).map_err(|e| e.to_string())
         })(),
-        Commands::Db { command } => command.run(alias).await.map_err(|e| e.to_string()),
+        Commands::Migrate { command } => command.run(alias).await.map_err(|e| e.to_string()),
         Commands::Workers { command } => run_workers_command(alias, command).await,
         Commands::Env { command } => run_env_command(alias, command).await,
         Commands::Storage { command } => run_storage_command(alias, command).await,