Fix compile warnings from tests

test-utils/src/sandbox.rs

@@ -104,6 +104,7 @@ $(
 
     #[test]
     fn $name() -> Result<(), Box<dyn std::error::Error>> {
+      use assert_cmd::cargo::cargo_bin_cmd;
       let ts_content = $ts_content;
       let test_config: TestConfig = $test_config;
       println!("checking test config {:?}", test_config);
@@ -127,7 +128,7 @@ $(
       let file_result = fs::read_to_string(&file_path)?;
 
       // EXECUTE
-      let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+      let mut cmd = cargo_bin_cmd!("sqlx-ts");
 
       cmd.arg(parent_path.to_str().unwrap())
           .arg(format!("--ext={file_extension}"))
@@ -196,4 +197,4 @@ $(
     }
 
 // MACRO ENDS
-)*};}
+)*};}

tests/alias.rs

@@ -1,10 +1,8 @@
 #[cfg(test)]
 mod alias {
-  use assert_cmd::prelude::*;
-
+  use assert_cmd::cargo::cargo_bin_cmd;
   use std::fs;
   use std::io::Write;
-  use std::process::Command;
   use tempfile::tempdir;
 
   #[test]
@@ -24,7 +22,7 @@ JOIN inventory ON items.inventory_id = inventory.id
     writeln!(temp_file, "{ts_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(parent_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -60,7 +58,7 @@ JOIN inventory ON items.inventory_id = inventory.id
     writeln!(temp_file, "{ts_content}").unwrap();
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(parent_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -95,7 +93,7 @@ JOIN inventory ON items.inventory_id = inventory.id
     writeln!(temp_file, "{ts_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(parent_path.to_str().unwrap())
       .arg("--ext=ts")

tests/cli.rs

@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod cli_test {
-  use assert_cmd::Command;
+  use assert_cmd::cargo::cargo_bin_cmd;
   use std::env::current_dir;
   use std::fs;
   use std::io::Write;
@@ -23,7 +23,7 @@ mod cli_test {
     writeln!(temp_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -61,7 +61,7 @@ mod cli_test {
     writeln!(temp_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -114,7 +114,7 @@ mod cli_test {
     writeln!(temp_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -160,7 +160,7 @@ mod cli_test {
     writeln!(temp_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -209,7 +209,7 @@ mod cli_test {
     writeln!(temp_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -232,7 +232,6 @@ mod cli_test {
     let demo_dir = tempdir()?;
     let demo_path = demo_dir.path();
     let sql_file_path = demo_path.join("test-query.sql");
-    let sample_query_path = demo_path.join("test-query.queries.ts");
 
     let config_dir = tempdir()?;
     let config_file_path = config_dir.path().join(".sqlxrc.json");
@@ -262,7 +261,7 @@ mod cli_test {
     writeln!(config_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -282,7 +281,6 @@ mod cli_test {
     let demo_dir = tempdir()?;
     let demo_path = demo_dir.path();
     let sql_file_path = demo_path.join("test-query.sql");
-    let sample_query_path = demo_path.join("test-query.queries.ts");
 
     let config_dir = tempdir()?;
     let config_file_path = config_dir.path().join(".sqlxrc.json");
@@ -308,7 +306,7 @@ mod cli_test {
     writeln!(config_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -326,7 +324,6 @@ mod cli_test {
     let demo_dir = tempdir()?;
     let demo_path = demo_dir.path();
     let sql_file_path = demo_path.join("test-query.sql");
-    let sample_query_path = demo_path.join("test-query.queries.ts");
 
     let config_dir = tempdir()?;
     let config_file_path = config_dir.path().join(".sqlxrc.json");
@@ -356,7 +353,7 @@ mod cli_test {
     writeln!(config_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -376,7 +373,6 @@ mod cli_test {
     let demo_dir = tempdir()?;
     let demo_path = demo_dir.path();
     let sql_file_path = demo_path.join("test-query.sql");
-    let sample_query_path = demo_path.join("test-query.queries.ts");
 
     let config_dir = tempdir()?;
     let config_file_path = config_dir.path().join(".sqlxrc.json");
@@ -402,7 +398,7 @@ mod cli_test {
     writeln!(config_file, "{config_content}")?;
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -449,7 +445,7 @@ mod cli_test {
     writeln!(config_file, "{config_content}")?;
 
     // EXECUTE - Pass in wrong db-url that should fail
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -498,7 +494,7 @@ mod cli_test {
     writeln!(config_file, "{config_content}")?;
 
     // EXECUTE - Pass in wrong db-url that should fail
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")

tests/column_naming_convention.rs

@@ -2,12 +2,9 @@
 ///
 #[cfg(test)]
 mod column_naming_convention_tests {
-  use assert_cmd::prelude::*;
-  use predicates::prelude::*;
   use std::env;
   use std::fs;
   use std::io::Write;
-  use std::process::Command;
   use tempfile::tempdir;
 
   use pretty_assertions::assert_eq;

tests/covert_to_camelcase.rs

@@ -2,12 +2,9 @@
 ///
 #[cfg(test)]
 mod convert_camelcase_tests {
-  use assert_cmd::prelude::*;
-  use predicates::prelude::*;
   use std::env;
   use std::fs;
   use std::io::Write;
-  use std::process::Command;
   use tempfile::tempdir;
 
   use pretty_assertions::assert_eq;

tests/demo_happy_path.rs

@@ -1,11 +1,10 @@
 #[cfg(test)]
 mod demo_happy_path_tests {
-  use assert_cmd::prelude::*;
+  use assert_cmd::cargo::cargo_bin_cmd;
   use pretty_assertions::assert_eq;
   use std::env::current_dir;
   use std::fs;
   use std::io::Write;
-  use std::process::Command;
   use walkdir::WalkDir;
 
   #[test]
@@ -15,7 +14,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo");
 
     // EXECUTE - Generate types for .ts files
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=ts")
@@ -32,7 +31,7 @@ mod demo_happy_path_tests {
     let file_extensions_path = demo_path.join("file_extensions");
     if file_extensions_path.exists() {
       for ext in &["js", "mts", "cts", "mjs", "cjs"] {
-        let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+        let mut cmd = cargo_bin_cmd!("sqlx-ts");
         cmd
           .arg(file_extensions_path.to_str().unwrap())
           .arg(format!("--ext={}", ext))
@@ -48,7 +47,7 @@ mod demo_happy_path_tests {
     // Also generate types for SQL files
     let sql_files_path = demo_path.join("sql_files");
     if sql_files_path.exists() {
-      let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+      let mut cmd = cargo_bin_cmd!("sqlx-ts");
       cmd
         .arg(sql_files_path.to_str().unwrap())
         .arg("--ext=sql")
@@ -98,7 +97,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo/file_extensions");
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=js")
@@ -122,7 +121,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo/file_extensions");
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=mts")
@@ -146,7 +145,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo/file_extensions");
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=cts")
@@ -170,7 +169,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo/file_extensions");
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=mjs")
@@ -194,7 +193,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo/file_extensions");
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=cjs")
@@ -218,7 +217,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo/sql_files");
 
     // EXECUTE
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=sql")
@@ -242,7 +241,7 @@ mod demo_happy_path_tests {
     let demo_path = root_path.join("tests/demo/file_extensions");
 
     // EXECUTE - Test scanning multiple extensions at once
-    let mut cmd = Command::cargo_bin("sqlx-ts").unwrap();
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .arg(demo_path.to_str().unwrap())
       .arg("--ext=js")

tests/dotenv.rs

@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod dotenv_test {
-  use assert_cmd::Command;
+  use assert_cmd::cargo::cargo_bin_cmd;
   use std::fs::{self};
 
   use tempfile::tempdir;
@@ -24,7 +24,7 @@ DB_NAME=postgres
     fs::create_dir_all(&sample_dir)?;
     fs::copy("tests/sample/sample.ts", sample_dir.join("sample.ts"))?;
 
-    let mut cmd = Command::cargo_bin("sqlx-ts")?;
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .current_dir(temp_dir.path())
       .arg("--ext=ts")
@@ -58,7 +58,7 @@ DB_NAME=postgres
     fs::create_dir_all(&sample_dir)?;
     fs::copy("tests/sample/sample.ts", sample_dir.join("sample.ts"))?;
 
-    let mut cmd = Command::cargo_bin("sqlx-ts")?;
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .current_dir(temp_dir.path())
       .arg("--ext=ts")
@@ -80,7 +80,7 @@ DB_NAME=postgres
     fs::create_dir_all(&sample_dir)?;
     fs::copy("tests/sample/sample.ts", sample_dir.join("sample.ts"))?;
 
-    let mut cmd = Command::cargo_bin("sqlx-ts")?;
+    let mut cmd = cargo_bin_cmd!("sqlx-ts");
     cmd
       .current_dir(temp_dir.path())
       .arg("--ext=ts")

tests/enums.rs

@@ -1,11 +1,9 @@
 #[cfg(test)]
 mod enums {
-  use assert_cmd::prelude::*;
   use pretty_assertions::assert_eq;
   use std::env;
   use std::fs;
   use std::io::Write;
-  use std::process::Command;
   use tempfile::tempdir;
 
   use test_utils::test_utils::TSString;