자동 포멧팅 기능 개선

Author: letspurify-ux

src/db/query/query_tests.rs

@@ -429,7 +429,7 @@ fn test_split_script_items_test12_if_alias_regression() {
         .count();
 
     assert_eq!(
-        tool_command_count, 2,
+        tool_command_count, 5,
         "unexpected tool command split: {items:?}"
     );
     assert_eq!(
@@ -465,7 +465,7 @@ fn test_split_script_items_test13_keyword_alias_regression() {
         .count();
 
     assert_eq!(
-        tool_command_count, 2,
+        tool_command_count, 5,
         "unexpected tool command split: {items:?}"
     );
     assert_eq!(
@@ -503,7 +503,7 @@ fn test_split_script_items_test14_deep_monster_view_regression() {
         .count();
 
     assert_eq!(
-        tool_command_count, 2,
+        tool_command_count, 3,
         "unexpected tool command split: {items:?}"
     );
     assert_eq!(
@@ -657,7 +657,7 @@ fn test_split_script_items_test17_execution_unit_final_boss_regression() {
         .count();
 
     assert_eq!(
-        tool_command_count, 0,
+        tool_command_count, 1,
         "unexpected tool command split: {items:?}"
     );
     assert_eq!(
@@ -716,7 +716,7 @@ fn test_split_script_items_test19_execution_unit_splitter_final_boss_regression(
         .count();
 
     assert_eq!(
-        tool_command_count, 0,
+        tool_command_count, 5,
         "unexpected tool command split: {items:?}"
     );
     assert_eq!(
@@ -775,7 +775,7 @@ fn test_split_script_items_test20_execution_unit_splitter_regression() {
         .count();
 
     assert_eq!(
-        tool_command_count, 0,
+        tool_command_count, 3,
         "unexpected tool command split: {items:?}"
     );
     assert_eq!(
@@ -834,7 +834,7 @@ fn test_split_script_items_test21_execution_unit_splitter_regression() {
         .count();
 
     assert_eq!(
-        tool_command_count, 0,
+        tool_command_count, 3,
         "unexpected tool command split: {items:?}"
     );
     assert_eq!(
@@ -1134,7 +1134,7 @@ fn test_split_format_items_test19_execution_unit_splitter_final_boss_regression(
         .filter(|item| matches!(item, FormatItem::Slash))
         .count();
 
-    assert_eq!(slash_count, 11, "unexpected slash split: {items:?}");
+    assert_eq!(slash_count, 14, "unexpected slash split: {items:?}");
 
     let statements: Vec<&str> = items
         .iter()
@@ -1191,7 +1191,7 @@ fn test_split_format_items_test20_execution_unit_splitter_regression() {
         .filter(|item| matches!(item, FormatItem::Slash))
         .count();
 
-    assert_eq!(slash_count, 36, "unexpected slash split: {items:?}");
+    assert_eq!(slash_count, 15, "unexpected slash split: {items:?}");
 
     let statements: Vec<&str> = items
         .iter()
@@ -1242,7 +1242,7 @@ fn test_split_format_items_test21_execution_unit_splitter_regression() {
         .filter(|item| matches!(item, FormatItem::Slash))
         .count();
 
-    assert_eq!(slash_count, 45, "unexpected slash split: {items:?}");
+    assert_eq!(slash_count, 25, "unexpected slash split: {items:?}");
 
     let statements: Vec<&str> = items
         .iter()
@@ -12357,8 +12357,7 @@ fn test_mariadb_test7_select_into_statements_are_not_displayable_results() {
 }
 
 #[test]
-fn test_split_script_items_mariadb_comment_final_boss_keeps_transaction_directive_as_tool_command()
-{
+fn test_split_script_items_mariadb_comment_final_boss_keeps_transaction_statement() {
     let sql = load_mariadb_query_test_file("test8.txt");
     assert!(
         !sql.is_empty(),
@@ -12368,11 +12367,10 @@ fn test_split_script_items_mariadb_comment_final_boss_keeps_transaction_directiv
     let items = QueryExecutor::split_script_items(&sql);
 
     assert!(
-        items.iter().any(|item| matches!(
-            item,
-            ScriptItem::ToolCommand(ToolCommand::SetAutoCommit { enabled: false })
-        )),
-        "test8 should keep @TRANSACTION as a transaction directive: {items:?}"
+        items.iter().any(
+            |item| matches!(item, ScriptItem::Statement(statement) if statement == "START TRANSACTION")
+        ),
+        "test8 should keep START TRANSACTION as a SQL statement: {items:?}"
     );
     assert!(
         !items.iter().any(|item| matches!(

src/ui/sql_editor/intellisense/completion.rs

@@ -42198,6 +42198,7 @@ impl SqlEditorWidget {
             "SCAN",
             "SERVEROUTPUT",
             "SQLBLANKLINES",
+            "SQLTERMINATOR",
             "TAB",
             "TERMOUT",
             "TIMING",
@@ -49376,6 +49377,7 @@ impl SqlEditorWidget {
             {
                 Some(&["ON", "OFF", "TRUE", "FALSE"])
             }
+            [set, option] if set == "SET" && option == "SQLTERMINATOR" => Some(&["ON", "OFF"]),
             [set, option]
                 if set == "SET"
                     && !crate::sql_text::SQLPLUS_SET_OPTION_KEYWORDS
@@ -49626,10 +49628,17 @@ impl SqlEditorWidget {
         // its leading word distinguishes a query (full clause set) from a
         // `DELETE`/`UPDATE` (which has no `GROUP BY`/`HAVING`/… - only MySQL adds
         // `ORDER BY`/`LIMIT`). Anything else (MERGE, INSERT, …) gets nothing.
-        let statement_head = tokens.iter().find_map(|token| match token {
-            SqlToken::Word(word) => Some(word.to_ascii_uppercase()),
-            _ => None,
-        });
+        // A branch narrowed after `UNION ALL`/`UNION DISTINCT` retains the set
+        // quantifier as its first token. It modifies the set operator, not the
+        // following query, so resolve the statement head from the first word
+        // after that retained modifier.
+        let statement_head = tokens
+            .iter()
+            .filter_map(|token| match token {
+                SqlToken::Word(word) => Some(word.to_ascii_uppercase()),
+                _ => None,
+            })
+            .find(|word| !matches!(word.as_str(), "ALL" | "DISTINCT"));
         // A query-defining DDL/DML wrapper (`CREATE VIEW … AS SELECT`, CTAS,
         // `INSERT … SELECT`) precedes the embedded query whose clauses the cursor is
         // in; resolve the head to that query's `SELECT`/`WITH` so its continuation
@@ -59541,6 +59550,7 @@ impl SqlEditorWidget {
                             | "HEADING"
                             | "SCAN"
                             | "SQLBLANKLINES"
+                            | "SQLTERMINATOR"
                             | "TAB"
                             | "TIMING"
                             | "TRIMOUT"

src/ui/sql_editor/intellisense/tests.rs

@@ -4789,6 +4789,75 @@ fn empty_group_by_slot_does_not_leak_downstream_openers() {
     assert!(oracle.iter().any(|k| k == "ROLLUP"), "{oracle:?}");
 }
 
+#[test]
+fn mysql_family_boolean_literal_join_condition_completes_join() {
+    use crate::db::DatabaseType::{MariaDB, MySQL};
+
+    let contains = |values: &[String], needle: &str| values.iter().any(|value| value == needle);
+    let final_suggestions = |sql: &str, db| audit_final_suggestions_for(sql, db).2;
+
+    for db in [MySQL, MariaDB] {
+        let join = final_suggestions("SELECT * FROM t1 JOIN t ON TRUE JOI|", db);
+        assert!(
+            contains(&join, "JOIN"),
+            "JOIN missing after a complete TRUE join condition for {db:?}: {join:?}"
+        );
+
+        let where_clause = final_suggestions("SELECT * FROM t1 JOIN t ON FALSE WHER|", db);
+        assert!(
+            contains(&where_clause, "WHERE"),
+            "WHERE missing after a complete FALSE join condition for {db:?}: {where_clause:?}"
+        );
+
+        let set_branch_join =
+            final_suggestions("SELECT 1 UNION ALL SELECT * FROM t1 JOIN t ON TRUE JOI|", db);
+        assert!(
+            contains(&set_branch_join, "JOIN"),
+            "JOIN missing in the second UNION ALL branch for {db:?}: {set_branch_join:?}"
+        );
+
+        let recursive_sql = "WITH RECURSIVE graph_walk AS (
+                SELECT 1 AS node_id
+                UNION ALL
+                SELECT edge.child_id
+                FROM graph_walk AS w
+                JOIN t AS parent ON parent.id = w.node_id
+                JOIN JSON_TABLE(
+                    parent.payload,
+                    '$.edges[*]' COLUMNS (child_id INT PATH '$')
+                ) AS edge ON TRUE
+                JOI|
+            )
+            SELECT * FROM graph_walk";
+        let recursive_context = analyze_inline_cursor_sql(recursive_sql);
+        let recursive_join = final_suggestions(recursive_sql, db);
+        assert!(
+            contains(&recursive_join, "JOIN"),
+            "JOIN missing after JSON_TABLE ... ON TRUE in a recursive CTE for {db:?}: \
+             phase={:?}, cursor_token_len={}, current_query_end={}, current_query={:?}, \
+             tokens={:?}, suggestions={recursive_join:?}",
+            recursive_context.phase,
+            recursive_context.cursor_token_len,
+            SqlEditorWidget::cursor_token_len_in_current_query(&recursive_context),
+            SqlEditorWidget::current_query_tokens(&recursive_context),
+            recursive_context.statement_tokens,
+        );
+
+        for sql in [
+            "SELECT * FROM t1 JOIN t ON |",
+            "SELECT * FROM t1 JOIN t ON t.id |",
+        ] {
+            let incomplete = final_suggestions(sql, db);
+            for leaked in ["JOIN", "WHERE", "GROUP BY", "ORDER BY", "LIMIT"] {
+                assert!(
+                    !contains(&incomplete, leaked),
+                    "{leaked} leaked after incomplete join condition `{sql}` for {db:?}: {incomplete:?}"
+                );
+            }
+        }
+    }
+}
+
 /// After the *complete* content of a query clause, the downstream clause openers
 /// (`GROUP BY`/`ORDER BY`/…) are offered - additively and in canonical order -
 /// so the popup is no longer silent there. The completeness gating must keep them
@@ -16992,6 +17061,15 @@ fn tool_command_keyword_slots_offer_only_supported_tool_keywords() {
         "SET AUTOCOMMIT __CODEX_CURSOR__",
         &["ON", "OFF", "TRUE", "FALSE"],
     );
+    assert_only(
+        "SET SQLTERMINATOR __CODEX_CURSOR__",
+        &["ON", "OFF"],
+    );
+    assert_only(
+        "SET SQLTERMINATOR O__CODEX_CURSOR__",
+        &["ON", "OFF"],
+    );
+    assert_only("SET SQLTERMINATOR OF__CODEX_CURSOR__", &["OFF"]);
     assert_only("SET VERIFY __CODEX_CURSOR__", &["ON", "OFF"]);
     assert_only("SET PAGESIZE __CODEX_CURSOR__", &[]);
     assert_only(
@@ -17429,7 +17507,13 @@ fn tool_command_keyword_slots_are_dialect_scoped() {
             );
         }
         let mysql_set = suggestions("SET |", db);
-        for oracle_only in ["AUTOCOMMIT", "SERVEROUTPUT", "PAGESIZE", "VERIFY"] {
+        for oracle_only in [
+            "AUTOCOMMIT",
+            "SERVEROUTPUT",
+            "SQLTERMINATOR",
+            "PAGESIZE",
+            "VERIFY",
+        ] {
             assert!(
                 !has(&mysql_set, oracle_only),
                 "{oracle_only} leaked into {db:?} SET slot: {mysql_set:?}"

test/final.sql.out

@@ -1020,7 +1020,7 @@ PROMPT [ORACLE FINAL] PASS
 -- db: Oracle
 -- metadata: test Oracle inferred catalog (file-scoped overlay) + Oracle built-ins
 -- checked: 2349
--- suggestions checked: 9138
+-- suggestions checked: 9164
 -- missing: 0
 -- suggestions without type labels: 0
 -- marker: [[word]] means not suggested for the tested prefix