feat: teach sqlx-cli about migrate.migrations-dir

Author: abonander

Cargo.lock

@@ -1,5 +1,5 @@
-use crate::migrate;
-use crate::opt::ConnectOpts;
+use crate::{migrate, Config};
+use crate::opt::{ConnectOpts, MigrationSourceOpt};
 use console::style;
 use promptly::{prompt, ReadlineError};
 use sqlx::any::Any;
@@ -44,18 +44,19 @@ pub async fn drop(connect_opts: &ConnectOpts, confirm: bool, force: bool) -> any
 }
 
 pub async fn reset(
-    migration_source: &str,
+    config: &Config,
+    migration_source: &MigrationSourceOpt,
     connect_opts: &ConnectOpts,
     confirm: bool,
     force: bool,
 ) -> anyhow::Result<()> {
     drop(connect_opts, confirm, force).await?;
-    setup(migration_source, connect_opts).await
+    setup(config, migration_source, connect_opts).await
 }
 
-pub async fn setup(migration_source: &str, connect_opts: &ConnectOpts) -> anyhow::Result<()> {
+pub async fn setup(config: &Config, migration_source: &MigrationSourceOpt, connect_opts: &ConnectOpts) -> anyhow::Result<()> {
     create(connect_opts).await?;
-    migrate::run(migration_source, connect_opts, false, false, None).await
+    migrate::run(config, migration_source, connect_opts, false, false, None).await
 }
 
 fn ask_to_continue_drop(db_url: &str) -> bool {

sqlx-cli/src/database.rs

@@ -39,6 +39,7 @@ pub async fn run(opt: Opt) -> Result<()> {
                 connect_opts.populate_db_url(config)?;
 
                 migrate::run(
+                    config,
                     &source,
                     &connect_opts,
                     dry_run,
@@ -57,6 +58,7 @@ pub async fn run(opt: Opt) -> Result<()> {
                 connect_opts.populate_db_url(config)?;
 
                 migrate::revert(
+                    config,
                     &source,
                     &connect_opts,
                     dry_run,
@@ -71,9 +73,9 @@ pub async fn run(opt: Opt) -> Result<()> {
             } => {
                 connect_opts.populate_db_url(config)?;
 
-                migrate::info(&source, &connect_opts).await?
+                migrate::info(config, &source, &connect_opts).await?
             },
-            MigrateCommand::BuildScript { source, force } => migrate::build_script(&source, force)?,
+            MigrateCommand::BuildScript { source, force } => migrate::build_script(config, &source, force)?,
         },
 
         Command::Database(database) => match database.command {
@@ -96,14 +98,14 @@ pub async fn run(opt: Opt) -> Result<()> {
                 force,
             } => {
                 connect_opts.populate_db_url(config)?;
-                database::reset(&source, &connect_opts, !confirmation.yes, force).await?
+                database::reset(config, &source, &connect_opts, !confirmation.yes, force).await?
             },
             DatabaseCommand::Setup {
                 source,
                 mut connect_opts,
             } => {
                 connect_opts.populate_db_url(config)?;
-                database::setup(&source, &connect_opts).await?
+                database::setup(config, &source, &connect_opts).await?
             },
         },