diff --git a/Cargo.lock b/Cargo.lock index 52c6926a5..9c9a6da0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -425,6 +425,22 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "console" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a50aab2529019abfabfa93f1e6c41ef392f91fbf179b347a7e96abb524884a08" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "regex", + "terminal_size", + "unicode-width", + "winapi 0.3.9", + "winapi-util", +] + [[package]] name = "copyless" version = "0.1.5" @@ -601,13 +617,14 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aa86af7b19b40ef9cbef761ed411a49f0afa06b7b6dcd3dfe2f96a3c546138" +checksum = "70f807b2943dc90f9747497d9d65d7e92472149be0b88bf4ce1201b4ac979c26" dependencies = [ - "console", + "console 0.13.0", "lazy_static", "tempfile", + "zeroize 0.9.3", ] [[package]] @@ -1257,7 +1274,7 @@ dependencies = [ "rand", "serde", "smallvec", - "zeroize", + "zeroize 1.1.0", ] [[package]] @@ -1706,7 +1723,7 @@ dependencies = [ "simple_asn1", "subtle", "thiserror", - "zeroize", + "zeroize 1.1.0", ] [[package]] @@ -2009,7 +2026,7 @@ dependencies = [ "cargo_metadata", "chrono", "clap 3.0.0-beta.2", - "console", + "console 0.11.3", "dialoguer", "dotenv", "futures", @@ -2790,6 +2807,12 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "zeroize" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45af6a010d13e4cf5b54c94ba5a2b2eba5596b9e46bf5875612d332a1f2b3f86" + [[package]] name = "zeroize" version = "1.1.0" diff --git a/sqlx-cli/Cargo.toml b/sqlx-cli/Cargo.toml index 8ffe1a176..a6e248fda 100644 --- a/sqlx-cli/Cargo.toml +++ b/sqlx-cli/Cargo.toml @@ -35,7 +35,7 @@ anyhow = "1.0" url = { version = "2.1.1", default-features = false } async-trait = "0.1.30" console = "0.11.3" -dialoguer = "0.6.2" +dialoguer = "0.7.1" serde_json = { version = "1.0.53", features = ["preserve_order"] } serde = "1.0.110" glob = "0.3.0" diff --git a/sqlx-cli/src/database.rs b/sqlx-cli/src/database.rs index 36b4e1fbc..901c44c63 100644 --- a/sqlx-cli/src/database.rs +++ b/sqlx-cli/src/database.rs @@ -19,6 +19,7 @@ pub async fn drop(uri: &str, confirm: bool) -> anyhow::Result<()> { "\nAre you sure you want to drop the database at {}?", style(uri).cyan() )) + .wait_for_newline(true) .default(false) .interact()? {