From bb33a296cb72d45aa793d3db3682a30b24fe554d Mon Sep 17 00:00:00 2001
From: David James <4576329+xpe@users.noreply.github.com>
Date: Fri, 10 Sep 2021 18:06:49 -0400
Subject: [PATCH] Fix issue #1431 (#1432)

Why: dotenv() must execute before clap's get_matches()

Co-authored-by: David James <davidcjames@gmail.com>
---
 sqlx-cli/src/bin/cargo-sqlx.rs | 2 ++
 sqlx-cli/src/bin/sqlx.rs       | 2 ++
 sqlx-cli/src/lib.rs            | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sqlx-cli/src/bin/cargo-sqlx.rs b/sqlx-cli/src/bin/cargo-sqlx.rs
index bfae83e9..a924af42 100644
--- a/sqlx-cli/src/bin/cargo-sqlx.rs
+++ b/sqlx-cli/src/bin/cargo-sqlx.rs
@@ -1,5 +1,6 @@
 use clap::{crate_version, AppSettings, FromArgMatches, IntoApp};
 use console::style;
+use dotenv::dotenv;
 use sqlx_cli::Opt;
 use std::{env, process};
 
@@ -9,6 +10,7 @@ async fn main() {
     // so we want to notch out that superfluous "sqlx"
     let args = env::args_os().skip(2);
 
+    dotenv().ok();
     let matches = Opt::into_app()
         .version(crate_version!())
         .bin_name("cargo sqlx")
diff --git a/sqlx-cli/src/bin/sqlx.rs b/sqlx-cli/src/bin/sqlx.rs
index 0d182785..e413581b 100644
--- a/sqlx-cli/src/bin/sqlx.rs
+++ b/sqlx-cli/src/bin/sqlx.rs
@@ -1,9 +1,11 @@
 use clap::{crate_version, FromArgMatches, IntoApp};
 use console::style;
+use dotenv::dotenv;
 use sqlx_cli::Opt;
 
 #[tokio::main]
 async fn main() {
+    dotenv().ok();
     let matches = Opt::into_app().version(crate_version!()).get_matches();
 
     // no special handling here
diff --git a/sqlx-cli/src/lib.rs b/sqlx-cli/src/lib.rs
index c8956e21..d02f4fa3 100644
--- a/sqlx-cli/src/lib.rs
+++ b/sqlx-cli/src/lib.rs
@@ -1,5 +1,4 @@
 use anyhow::Result;
-use dotenv::dotenv;
 
 use crate::opt::{Command, DatabaseCommand, MigrateCommand};
 
@@ -13,8 +12,6 @@ mod prepare;
 pub use crate::opt::Opt;
 
 pub async fn run(opt: Opt) -> Result<()> {
-    dotenv().ok();
-
     match opt.command {
         Command::Migrate(migrate) => match migrate.command {
             MigrateCommand::Add {