From 12da5ba534ea86c44acb2615091d0009d05c362a Mon Sep 17 00:00:00 2001
From: Ryan Leckey <ryan@launchbadge.com>
Date: Thu, 12 Nov 2020 07:38:54 -0800
Subject: [PATCH] fix: usage of migrate::run now takes two parameters

---
 sqlx-cli/src/database.rs |  8 ++++----
 sqlx-cli/src/lib.rs      |  6 ++++--
 sqlx-cli/src/opt.rs      | 12 +++++++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sqlx-cli/src/database.rs b/sqlx-cli/src/database.rs
index 901c44c6..0ee3ba0b 100644
--- a/sqlx-cli/src/database.rs
+++ b/sqlx-cli/src/database.rs
@@ -33,12 +33,12 @@ pub async fn drop(uri: &str, confirm: bool) -> anyhow::Result<()> {
     Ok(())
 }
 
-pub async fn reset(uri: &str, confirm: bool) -> anyhow::Result<()> {
+pub async fn reset(migration_source: &str, uri: &str, confirm: bool) -> anyhow::Result<()> {
     drop(uri, confirm).await?;
-    setup(uri).await
+    setup(migration_source, uri).await
 }
 
-pub async fn setup(uri: &str) -> anyhow::Result<()> {
+pub async fn setup(migration_source: &str, uri: &str) -> anyhow::Result<()> {
     create(uri).await?;
-    migrate::run(uri).await
+    migrate::run(migration_source, uri).await
 }
diff --git a/sqlx-cli/src/lib.rs b/sqlx-cli/src/lib.rs
index 12b9753f..c3ac96d9 100644
--- a/sqlx-cli/src/lib.rs
+++ b/sqlx-cli/src/lib.rs
@@ -39,8 +39,10 @@ hint: This command only works in the manifest directory of a Cargo package."#
         Command::Database(database) => match database.command {
             DatabaseCommand::Create => database::create(&database_url).await?,
             DatabaseCommand::Drop { yes } => database::drop(&database_url, !yes).await?,
-            DatabaseCommand::Reset { yes } => database::reset(&database_url, yes).await?,
-            DatabaseCommand::Setup => database::setup(&database_url).await?,
+            DatabaseCommand::Reset { yes, source } => {
+                database::reset(&source, &database_url, yes).await?
+            }
+            DatabaseCommand::Setup { source } => database::setup(&source, &database_url).await?,
         },
 
         Command::Prepare { check: false, args } => prepare::run(&database_url, args)?,
diff --git a/sqlx-cli/src/opt.rs b/sqlx-cli/src/opt.rs
index 5a49d61f..d04506cb 100644
--- a/sqlx-cli/src/opt.rs
+++ b/sqlx-cli/src/opt.rs
@@ -57,15 +57,25 @@ pub enum DatabaseCommand {
         #[clap(short)]
         yes: bool,
     },
+
     /// Drops the database specified in your DATABASE_URL, re-creates it, and runs any pending migrations.
     Reset {
         /// Automatic confirmation. Without this option, you will be prompted before dropping
         /// your database.
         #[clap(short)]
         yes: bool,
+
+        /// Path to folder containing migrations. Defaults to 'migrations'
+        #[clap(long, default_value = "migrations")]
+        source: String,
     },
+
     /// Creates the database specified in your DATABASE_URL and runs any pending migrations.
-    Setup,
+    Setup {
+        /// Path to folder containing migrations. Defaults to 'migrations'
+        #[clap(long, default_value = "migrations")]
+        source: String,
+    },
 }
 
 /// Group of commands for creating and running migrations.