From 0a52066cee2063a11832d642a990033f502b279f Mon Sep 17 00:00:00 2001 From: Jareth Gomes Date: Mon, 23 Feb 2026 09:31:56 -0800 Subject: [PATCH 1/2] Remove deprecated warnings from tests --- test-utils/src/sandbox.rs | 5 +++-- tests/alias.rs | 10 ++++----- tests/cli.rs | 24 ++++++++++----------- tests/column_naming_convention.rs | 3 --- tests/covert_to_camelcase.rs | 3 --- tests/demo_happy_path.rs | 23 ++++++++++---------- tests/dotenv.rs | 8 +++---- tests/enums.rs | 2 -- tests/exit_code_on_error.rs | 13 ++++++------ tests/generate_path.rs | 2 -- tests/mysql_delete_query_parameters.rs | 2 -- tests/mysql_insert_query_parameters.rs | 2 -- tests/mysql_query_parameters.rs | 2 -- tests/mysql_test_failure_path.rs | 7 +++--- tests/mysql_update_query_parameters.rs | 2 -- tests/postgres_batch_insert.rs | 2 -- tests/postgres_delete_query_parameters.rs | 2 -- tests/postgres_insert_query_parameters.rs | 2 -- tests/postgres_lateral_tables.rs | 2 -- tests/postgres_query_parameters.rs | 2 -- tests/postgres_test_failure_path.rs | 7 +++--- tests/postgres_update_query_parameters.rs | 2 -- tests/sql_file_support.rs | 26 +++++++++++------------ tests/sqlxrc_file.rs | 2 -- tests/string_functions.rs | 2 -- 25 files changed, 59 insertions(+), 98 deletions(-) diff --git a/test-utils/src/sandbox.rs b/test-utils/src/sandbox.rs index 9bcd6e1f..fea3d312 100644 --- a/test-utils/src/sandbox.rs +++ b/test-utils/src/sandbox.rs @@ -104,6 +104,7 @@ $( #[test] fn $name() -> Result<(), Box> { + 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 -)*};} \ No newline at end of file +)*};} diff --git a/tests/alias.rs b/tests/alias.rs index 9ccb53e6..df6bf8bd 100644 --- a/tests/alias.rs +++ b/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") diff --git a/tests/cli.rs b/tests/cli.rs index b87f9483..e9c4c986 100644 --- a/tests/cli.rs +++ b/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") @@ -262,7 +262,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") @@ -308,7 +308,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") @@ -356,7 +356,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") @@ -402,7 +402,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 +449,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 +498,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") diff --git a/tests/column_naming_convention.rs b/tests/column_naming_convention.rs index d8208e20..1266ce88 100644 --- a/tests/column_naming_convention.rs +++ b/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; diff --git a/tests/covert_to_camelcase.rs b/tests/covert_to_camelcase.rs index d72c6d67..8639be68 100644 --- a/tests/covert_to_camelcase.rs +++ b/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; diff --git a/tests/demo_happy_path.rs b/tests/demo_happy_path.rs index a99a9c49..33c27036 100644 --- a/tests/demo_happy_path.rs +++ b/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") diff --git a/tests/dotenv.rs b/tests/dotenv.rs index 927f8414..903943ae 100644 --- a/tests/dotenv.rs +++ b/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") diff --git a/tests/enums.rs b/tests/enums.rs index a902c7d9..65051971 100644 --- a/tests/enums.rs +++ b/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; diff --git a/tests/exit_code_on_error.rs b/tests/exit_code_on_error.rs index 780d0509..d3c5a9a1 100644 --- a/tests/exit_code_on_error.rs +++ b/tests/exit_code_on_error.rs @@ -1,9 +1,8 @@ #[cfg(test)] mod exit_code_tests { - 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; /// This test verifies that even when there are multiple SQL queries with mixed @@ -31,7 +30,7 @@ const anotherValidQuery = sql`SELECT * FROM inventory WHERE character_id = $1;`; writeln!(temp_file, "{}", index_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()) @@ -72,7 +71,7 @@ const query3 = sql`SELECT * FROM items WHERE id = $1;`; writeln!(temp_file, "{}", index_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()) @@ -125,7 +124,7 @@ const query10 = sql`SELECT id, name FROM characters LIMIT 10;`; writeln!(temp_file, "{}", index_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()) @@ -181,7 +180,7 @@ const failQuery2 = sql`SELECT * FROM another_missing_table;`; writeln!(file2, "{}", file2_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()) @@ -250,7 +249,7 @@ const query6 = sql`SELECT rarity FROM items WHERE id = $1;`; writeln!(file3, "{}", file3_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()) diff --git a/tests/generate_path.rs b/tests/generate_path.rs index 8bfb02cd..7b67b22c 100644 --- a/tests/generate_path.rs +++ b/tests/generate_path.rs @@ -2,12 +2,10 @@ /// #[cfg(test)] mod generate_path_tests { - use assert_cmd::prelude::*; use std::env; use std::fs; use std::io::Write; use std::path::PathBuf; - use std::process::Command; use tempfile::tempdir; use pretty_assertions::assert_eq; diff --git a/tests/mysql_delete_query_parameters.rs b/tests/mysql_delete_query_parameters.rs index bd6dde2c..aa325513 100644 --- a/tests/mysql_delete_query_parameters.rs +++ b/tests/mysql_delete_query_parameters.rs @@ -1,11 +1,9 @@ #[cfg(test)] mod mysql_delete_query_parameters { - 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; diff --git a/tests/mysql_insert_query_parameters.rs b/tests/mysql_insert_query_parameters.rs index c9655fa4..808f8b86 100644 --- a/tests/mysql_insert_query_parameters.rs +++ b/tests/mysql_insert_query_parameters.rs @@ -1,11 +1,9 @@ #[cfg(test)] mod mysql_insert_query_parameters { - 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; diff --git a/tests/mysql_query_parameters.rs b/tests/mysql_query_parameters.rs index cc584e10..c5698661 100644 --- a/tests/mysql_query_parameters.rs +++ b/tests/mysql_query_parameters.rs @@ -1,11 +1,9 @@ #[cfg(test)] mod mysql_query_parameters_tests { - 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; diff --git a/tests/mysql_test_failure_path.rs b/tests/mysql_test_failure_path.rs index 076df352..7d4f008d 100644 --- a/tests/mysql_test_failure_path.rs +++ b/tests/mysql_test_failure_path.rs @@ -1,10 +1,9 @@ #[cfg(test)] mod mysql_failure_path_tests { - 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; macro_rules! failure_with_all_cli_args { @@ -107,7 +106,7 @@ do { writeln!(temp_file, "{}", index_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(format!("--ext={ts_type}")) @@ -206,7 +205,7 @@ function test() { writeln!(temp_file, "{}", index_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(format!("--ext={ts_type}")) diff --git a/tests/mysql_update_query_parameters.rs b/tests/mysql_update_query_parameters.rs index 35f4104e..326fcee7 100644 --- a/tests/mysql_update_query_parameters.rs +++ b/tests/mysql_update_query_parameters.rs @@ -1,11 +1,9 @@ #[cfg(test)] mod mysql_update_query_parameters { - 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; diff --git a/tests/postgres_batch_insert.rs b/tests/postgres_batch_insert.rs index 99ae1c42..47f28603 100644 --- a/tests/postgres_batch_insert.rs +++ b/tests/postgres_batch_insert.rs @@ -1,10 +1,8 @@ #[cfg(test)] mod postgres_batch_insert { - use assert_cmd::prelude::*; use std::env; use std::fs; use std::io::Write; - use std::process::Command; use tempfile::tempdir; use test_utils::test_utils::TSString; use test_utils::{run_test, sandbox::TestConfig}; diff --git a/tests/postgres_delete_query_parameters.rs b/tests/postgres_delete_query_parameters.rs index 292cf809..3d018f3b 100644 --- a/tests/postgres_delete_query_parameters.rs +++ b/tests/postgres_delete_query_parameters.rs @@ -1,11 +1,9 @@ #[cfg(test)] mod mysql_delete_query_parameters { - 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; diff --git a/tests/postgres_insert_query_parameters.rs b/tests/postgres_insert_query_parameters.rs index c4a837cb..0bfd671f 100644 --- a/tests/postgres_insert_query_parameters.rs +++ b/tests/postgres_insert_query_parameters.rs @@ -1,11 +1,9 @@ #[cfg(test)] mod postgres_insert_query_parameters { - 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; diff --git a/tests/postgres_lateral_tables.rs b/tests/postgres_lateral_tables.rs index 9ab1ddb1..bd049e07 100644 --- a/tests/postgres_lateral_tables.rs +++ b/tests/postgres_lateral_tables.rs @@ -1,10 +1,8 @@ #[cfg(test)] mod postgres_table_lateral_functions { - use assert_cmd::prelude::*; use std::env; use std::fs; use std::io::Write; - use std::process::Command; use tempfile::tempdir; use test_utils::test_utils::TSString; use test_utils::{run_test, sandbox::TestConfig}; diff --git a/tests/postgres_query_parameters.rs b/tests/postgres_query_parameters.rs index da1d6d0d..9df67d00 100644 --- a/tests/postgres_query_parameters.rs +++ b/tests/postgres_query_parameters.rs @@ -1,10 +1,8 @@ #[cfg(test)] mod postgres_query_parameters_tests { - use assert_cmd::prelude::*; use std::env; use std::fs; use std::io::Write; - use std::process::Command; use tempfile::tempdir; use pretty_assertions::assert_eq; diff --git a/tests/postgres_test_failure_path.rs b/tests/postgres_test_failure_path.rs index f30e51a5..026f438d 100644 --- a/tests/postgres_test_failure_path.rs +++ b/tests/postgres_test_failure_path.rs @@ -1,10 +1,9 @@ #[cfg(test)] mod js_postgres_failure_path_tests { - 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; macro_rules! failure_with_all_cli_args { @@ -107,7 +106,7 @@ i++; writeln!(temp_file, "{}", index_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(format!("--ext={ts_type}")) @@ -205,7 +204,7 @@ VALUES ('steak', 'normal', 'asd', 1); writeln!(temp_file, "{}", index_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(format!("--ext={ts_type}")) diff --git a/tests/postgres_update_query_parameters.rs b/tests/postgres_update_query_parameters.rs index 1fdfd788..c102eb8d 100644 --- a/tests/postgres_update_query_parameters.rs +++ b/tests/postgres_update_query_parameters.rs @@ -1,11 +1,9 @@ #[cfg(test)] mod postgres_update_query_parameters { - 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; diff --git a/tests/sql_file_support.rs b/tests/sql_file_support.rs index 9ae44e35..2fb2cab4 100644 --- a/tests/sql_file_support.rs +++ b/tests/sql_file_support.rs @@ -1,4 +1,4 @@ -use assert_cmd::Command; +use assert_cmd::cargo::cargo_bin_cmd; use std::fs; use tempfile::tempdir; @@ -21,7 +21,7 @@ SELECT id, name, level, experience FROM characters WHERE level > 1; fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -63,7 +63,7 @@ INSERT INTO characters (name, race_id, class_id, level) VALUES ($1, $2, $3, $4) fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -106,7 +106,7 @@ WHERE f.name = $1; fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -179,7 +179,7 @@ ORDER BY c.level DESC; fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -221,7 +221,7 @@ INSERT INTO characters (name, race_id, class_id, level) VALUES (?, ?, ?, ?); fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -281,7 +281,7 @@ WHERE level > 1 fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -318,7 +318,7 @@ WHERE level > 1 fs::write(&inventory_sql, "SELECT * FROM inventory WHERE character_id = $1;")?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -354,7 +354,7 @@ SELECT id, name, FROM characters WHERE; -- Missing table and incomplete WHERE cl fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -421,7 +421,7 @@ SELECT * FROM characters WHERE level > $1; fs::write(&config_file, config_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -456,7 +456,7 @@ SELECT id, name, level, experience FROM characters WHERE id = $1; fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -493,7 +493,7 @@ SELECT id, name, level, experience FROM characters WHERE id = $1; fs::write(&sql_file, "")?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") @@ -545,7 +545,7 @@ WHERE i.rarity = $1; fs::write(&sql_file, sql_content)?; // EXECUTE - let mut cmd = Command::cargo_bin("sqlx-ts")?; + let mut cmd = cargo_bin_cmd!("sqlx-ts"); cmd .arg(dir_path.to_str().unwrap()) .arg("--ext=sql") diff --git a/tests/sqlxrc_file.rs b/tests/sqlxrc_file.rs index 050e8216..8cf6164a 100644 --- a/tests/sqlxrc_file.rs +++ b/tests/sqlxrc_file.rs @@ -2,11 +2,9 @@ /// #[cfg(test)] mod sqlxrc_file { - use assert_cmd::prelude::*; use std::env; use std::fs; use std::io::Write; - use std::process::Command; use tempfile::tempdir; use pretty_assertions::assert_eq; diff --git a/tests/string_functions.rs b/tests/string_functions.rs index ec001841..6be704d7 100644 --- a/tests/string_functions.rs +++ b/tests/string_functions.rs @@ -1,10 +1,8 @@ #[cfg(test)] mod string_functions_tests { - use assert_cmd::prelude::*; use std::env; use std::fs; use std::io::Write; - use std::process::Command; use tempfile::tempdir; use pretty_assertions::assert_eq; From 3bf3c947dcf72e2c60a6c7d5140cba53e391bde1 Mon Sep 17 00:00:00 2001 From: Jareth Gomes Date: Mon, 23 Feb 2026 23:00:52 -0800 Subject: [PATCH 2/2] Remove unused variables from tests --- tests/cli.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/cli.rs b/tests/cli.rs index e9c4c986..1f1ab0d2 100644 --- a/tests/cli.rs +++ b/tests/cli.rs @@ -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"); @@ -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"); @@ -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"); @@ -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");