fix

Author: JasonShin

test-utils/src/sandbox.rs

@@ -96,8 +96,139 @@ impl TestConfig {
     }
 }
 
+/// Checks if the MySQL server at the given host:port is above the specified major.minor version.
+/// Uses `docker exec` to query the version. Returns true if version cannot be determined.
+pub fn is_mysql_version_above(db_host: &str, db_port: i32, major: u32, minor: u32) -> bool {
+  let output = std::process::Command::new("docker")
+    .args(["exec", "sqlx-ts-mysql-1", "mysql", "-u", "root", "-N", "-e", "SELECT VERSION();"])
+    .output();
+  match output {
+    Ok(out) => {
+      let version = String::from_utf8_lossy(&out.stdout);
+      let version = version.trim();
+      let parts: Vec<&str> = version.split('.').collect();
+      if parts.len() >= 2 {
+        let srv_major: u32 = parts[0].parse().unwrap_or(0);
+        let srv_minor: u32 = parts[1].parse().unwrap_or(0);
+        srv_major > major || (srv_major == major && srv_minor > minor)
+      } else {
+        true
+      }
+    }
+    Err(_) => true,
+  }
+}
+
 #[macro_export]
 macro_rules! run_test {
+// Arm with minimum MySQL version requirement: (major, minor)
+($($name: ident, $test_config: expr, $ts_content: expr, $generated_types: expr, min_mysql: ($maj:expr, $min:expr))*) => {
+$(
+    #[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;
+
+      // Check minimum MySQL version requirement
+      if test_config.db_type == "mysql" {
+        if !test_utils::sandbox::is_mysql_version_above(&test_config.db_host, test_config.db_port, $maj, $min) {
+          eprintln!("Skipping test {}: requires MySQL > {}.{}", stringify!($name), $maj, $min);
+          return Ok(());
+        }
+      }
+
+      println!("checking test config {:?}", test_config);
+      let file_extension = test_config.file_extension;
+      let db_type = test_config.db_type;
+      let db_host = test_config.db_host;
+      let db_port = test_config.db_port;
+      let db_user = test_config.db_user;
+      let db_pass = test_config.db_pass;
+      let db_name = test_config.db_name;
+      let config_file_name = test_config.config_file_name;
+      let generate_path = test_config.generate_path;
+
+      // SETUP
+      let dir = tempdir()?;
+      let parent_path = dir.path();
+      let file_path = parent_path.join(format!("index.{file_extension}"));
+
+      let mut temp_file = fs::File::create(&file_path)?;
+      writeln!(temp_file, "{}", ts_content)?;
+      let file_result = fs::read_to_string(&file_path)?;
+
+      // EXECUTE
+      let mut cmd = cargo_bin_cmd!("sqlx-ts");
+
+      cmd.arg(parent_path.to_str().unwrap())
+          .arg(format!("--ext={file_extension}"))
+          .arg(format!("--db-type={db_type}"))
+          .arg(format!("--db-host={db_host}"))
+          .arg(format!("--db-port={db_port}"))
+          .arg(format!("--db-user={db_user}"))
+          .arg(format!("--db-name={db_name}"));
+
+      if &generate_path.is_some() == &true {
+        let generate_path = generate_path.clone();
+        let generate_path = generate_path.unwrap();
+        let generate_path = generate_path.as_path();
+        let generate_path = parent_path.join(generate_path);
+        let generate_path = generate_path.display();
+        cmd.arg(format!("--generate-path={generate_path}"));
+      }
+
+      if (test_config.generate_types) {
+        cmd.arg("-g");
+      }
+
+      if (config_file_name.is_some()) {
+        let cwd = env::current_dir()?;
+        let config_file_name = format!("{}", config_file_name.unwrap());
+        let config_path = cwd.join(format!("tests/configs/{config_file_name}"));
+        let config_path = config_path.display();
+        cmd.arg(format!("--config={config_path}"));
+      }
+
+      if (db_pass.is_some()) {
+        let db_pass = db_pass.unwrap();
+        cmd.arg(format!("--db-pass={db_pass}"));
+      } else {
+        cmd.arg("--db-pass=");
+      }
+
+      cmd.assert()
+         .success()
+         .stdout(predicates::str::contains("No SQL errors detected!"));
+
+      let generated_types: &str = $generated_types.clone();
+
+      if generate_path.is_some() {
+        let generate_path = parent_path.join(generate_path.unwrap().as_path());
+        let type_file = fs::read_to_string(generate_path);
+        let type_file = type_file.unwrap();
+
+        assert_eq!(
+            generated_types.trim().to_string().flatten(),
+            type_file.trim().to_string().flatten()
+        );
+        return Ok(());
+      }
+
+      let type_file = fs::read_to_string(parent_path.join("index.queries.ts"));
+      if type_file.is_ok() {
+        let type_file = type_file.unwrap().clone();
+        let type_file = type_file.trim();
+        assert_eq!(
+            generated_types.trim().to_string().flatten(),
+            type_file.to_string().flatten()
+        );
+      }
+      Ok(())
+    }
+)*};
+
+// Original arm without version requirement
 ($($name: ident, $test_config: expr, $ts_content: expr, $generated_types: expr)*) => {
 $(
 // MACRO STARTS
@@ -117,7 +248,7 @@ $(
       let db_name = test_config.db_name;
       let config_file_name = test_config.config_file_name;
       let generate_path = test_config.generate_path;
-      
+
       // SETUP
       let dir = tempdir()?;
       let parent_path = dir.path();
@@ -126,7 +257,7 @@ $(
       let mut temp_file = fs::File::create(&file_path)?;
       writeln!(temp_file, "{}", ts_content)?;
       let file_result = fs::read_to_string(&file_path)?;
-      
+
       // EXECUTE
       let mut cmd = cargo_bin_cmd!("sqlx-ts");
 

tests/mysql_query_parameters.rs

@@ -149,6 +149,7 @@ export interface ISomeQueryQuery {
 "#);
 
   // Issue #266: Query params should be detected when placeholder is on the left side of a comparison
+  // Skipped on MySQL <= 5.7 because TIMESTAMP nullability defaults differ between versions
   #[rustfmt::skip]
 run_test!(should_pick_query_params_when_placeholder_before_comparison, TestConfig::new("mysql", true, None, None),
 
@@ -186,9 +187,10 @@ export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
 }
-"#);
+"#, min_mysql: (5, 7));
 
   // Issue #266: Query params should be detected in BETWEEN clause when placeholder is the expr
+  // Skipped on MySQL <= 5.7 because TIMESTAMP nullability defaults differ between versions
   #[rustfmt::skip]
 run_test!(should_pick_query_params_from_between_with_placeholder_expr, TestConfig::new("mysql", true, None, None),
 
@@ -225,9 +227,10 @@ export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
 }
-"#);
+"#, min_mysql: (5, 7));
 
   // Issue #266: Standard BETWEEN with placeholders as low/high should still work
+  // Skipped on MySQL <= 5.7 because TIMESTAMP nullability defaults differ between versions
   #[rustfmt::skip]
 run_test!(should_pick_query_params_from_between_with_placeholder_bounds, TestConfig::new("mysql", true, None, None),
 
@@ -263,5 +266,5 @@ export interface ISomeQueryQuery {
     params: SomeQueryParams;
     result: ISomeQueryResult;
 }
-"#);
+"#, min_mysql: (5, 7));
 }