add normalize_with_options function (#3)

takaebato · Feb 12, 2024 · 0924fef · 0924fef
1 parent 9ca906b
commit 0924fef
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/sql-insight-cli/src/executor.rs b/sql-insight-cli/src/executor.rs
@@ -55,7 +55,7 @@ impl NormalizeExecutor {
 
 impl CliExecutable for NormalizeExecutor {
     fn execute(&self) -> Result<Vec<String>, Error> {
-        sql_insight::normalize(
+        sql_insight::normalize_with_options(
             get_dialect(self.dialect_name.as_deref())?.as_ref(),
             self.sql.as_ref(),
             self.options.clone(),

diff --git a/sql-insight/src/normalizer.rs b/sql-insight/src/normalizer.rs
@@ -6,7 +6,11 @@ use sqlparser::ast::{Expr, VisitMut, VisitorMut};
 use sqlparser::dialect::Dialect;
 use sqlparser::parser::Parser;
 
-pub fn normalize(
+pub fn normalize(dialect: &dyn Dialect, sql: &str) -> Result<Vec<String>, Error> {
+    Normalizer::normalize(dialect, sql, NormalizerOptions::new())
+}
+
+pub fn normalize_with_options(
     dialect: &dyn Dialect,
     sql: &str,
     options: NormalizerOptions,

diff --git a/sql-insight/tests/integration.rs b/sql-insight/tests/integration.rs
@@ -28,16 +28,32 @@ mod integration {
         fn test_normalize() {
             let sql = "SELECT a FROM t1 WHERE b = 1 AND c in (2, 3) AND d LIKE '%foo'";
             for dialect in all_dialects() {
-                let result =
-                    sql_insight::normalize(dialect.as_ref(), sql, NormalizerOptions::new())
-                        .unwrap();
+                let result = sql_insight::normalize(dialect.as_ref(), sql).unwrap();
                 assert_eq!(
                     result,
                     ["SELECT a FROM t1 WHERE b = ? AND c IN (?, ?) AND d LIKE ?"],
                     "Failed for dialect: {dialect:?}"
                 )
             }
         }
+
+        #[test]
+        fn test_normalize_with_options() {
+            let sql = "SELECT a FROM t1 WHERE b = 1 AND c in (2, 3, 4)";
+            for dialect in all_dialects() {
+                let result = sql_insight::normalize_with_options(
+                    dialect.as_ref(),
+                    sql,
+                    NormalizerOptions::new().with_unify_in_list(true),
+                )
+                .unwrap();
+                assert_eq!(
+                    result,
+                    ["SELECT a FROM t1 WHERE b = ? AND c IN (...)"],
+                    "Failed for dialect: {dialect:?}"
+                )
+            }
+        }
     }
 
     mod extract_crud_tables {