자동 포멧팅 기능 개선

Author: letspurify-ux

src/db/query/executor.rs

@@ -1749,6 +1749,17 @@ impl QueryExecutor {
         let Some(prefix) = sql.get(..line_start) else {
             return false;
         };
+        if sql_text::mysql_compatibility_for_sql(sql, preferred_db_type)
+            && trimmed_line.starts_with('@')
+        {
+            let statement_tail_start = prefix.rfind(';').map_or(0, |idx| idx.saturating_add(1));
+            if prefix
+                .get(statement_tail_start..)
+                .is_some_and(|tail| !Self::strip_comments(tail).trim().is_empty())
+            {
+                return true;
+            }
+        }
         let follows_open_comma_list = prefix
             .lines()
             .rev()

src/db/query/query_tests.rs

@@ -9758,6 +9758,50 @@ fn test_statement_bounds_at_cursor_for_mysql_db_type_keeps_double_dash_arithmeti
     );
 }
 
+#[test]
+fn test_mysql_family_line_leading_select_into_variables_stay_in_the_open_statement() {
+    let sql = "WITH collapsed AS (SELECT 1 AS n)\n\
+               SELECT COUNT(*), SUM(n)\n\
+               INTO\n\
+                 @row_count,\n\
+                 @total\n\
+               FROM collapsed;\n\
+               SELECT 2;\n";
+
+    for db_type in [
+        crate::db::connection::DatabaseType::MySQL,
+        crate::db::connection::DatabaseType::MariaDB,
+    ] {
+        let items = QueryExecutor::split_script_items_for_db_type(sql, Some(db_type));
+        let statements = get_statements(&items);
+        assert_eq!(
+            statements.len(),
+            2,
+            "{db_type:?} split line-leading user variables as SQL*Plus commands: {items:?}"
+        );
+        assert!(
+            statements[0].starts_with("WITH collapsed")
+                && statements[0].contains("@row_count")
+                && statements[0].contains("@total")
+                && statements[0].contains("FROM collapsed"),
+            "{db_type:?} lost part of SELECT INTO: {}",
+            statements[0]
+        );
+
+        let cursor = sql.find("collapsed;").expect("collapsed source");
+        let bounds =
+            QueryExecutor::statement_bounds_at_cursor_for_db_type(sql, cursor, Some(db_type))
+                .expect("SELECT INTO statement bounds");
+        let statement = &sql[bounds.0..bounds.1];
+        assert!(
+            statement.trim_start().starts_with("WITH collapsed")
+                && statement.contains("@row_count")
+                && statement.contains("@total"),
+            "{db_type:?} statement bounds started after line-leading user variables: {statement:?}"
+        );
+    }
+}
+
 #[test]
 fn test_parse_tool_command_mysql_show_tables_is_mysql_command() {
     let command = QueryExecutor::parse_tool_command("SHOW TABLES")

src/db/query/script.rs

@@ -9282,6 +9282,8 @@ impl QueryExecutor {
         // aliases such as `r`, which otherwise resembles SQL*Plus RUN.
         let is_list_continuation_line =
             !builder.current_is_empty() && builder.current_ends_with_list_continuation_comma();
+        let is_mysql_user_variable_line =
+            builder.mysql_mode() && !builder.current_is_empty() && trimmed.starts_with('@');
         let is_mysql_diagnostics_item_line =
             !builder.current_is_empty() && builder.starts_with_mysql_get_diagnostics_context();
 
@@ -9298,6 +9300,7 @@ impl QueryExecutor {
             && !is_ddl_element_continuation_line
             && !is_mysql_index_hint_line
             && !is_list_continuation_line
+            && !is_mysql_user_variable_line
             && !is_mysql_diagnostics_item_line
             && Self::parse_tool_command_if_candidate(trimmed).is_some()
         {
@@ -9320,6 +9323,7 @@ impl QueryExecutor {
             && !is_ddl_element_continuation_line
             && !is_mysql_index_hint_line
             && !is_list_continuation_line
+            && !is_mysql_user_variable_line
             && !is_mysql_diagnostics_item_line
         {
             if let Some(command) = Self::parse_tool_command_if_candidate(trimmed) {

src/ui/sql_editor/format_sweep_tests.rs

@@ -3751,7 +3751,7 @@ fn formatting_sweep_additional_non_parenthesized_child_lists_have_typed_frames()
         ),
         (
             DatabaseType::MariaDB,
-            "UPDATE t1, t2 SET t1.v = 1, t2.v = 2; ALTER TABLE t1 ADD a INT, ADD b INT; CHECK TABLE t1, t2; CHECKSUM TABLE t1, t2; REPAIR TABLE t1, t2; GRANT role_a, role_b TO user_a, user_b; CREATE PROCEDURE p() BEGIN DECLARE v_a, v_b INT; DO v_a, v_b; END;",
+            "UPDATE t1, t2 SET t1.v = 1, t2.v = 2; ALTER TABLE t1 ADD a INT, ADD b INT; CHECK TABLE t1, t2; CHECKSUM TABLE t1, t2; REPAIR TABLE t1, t2; CHECK VIEW v1, v2 FOR UPGRADE; REPAIR VIEW v1, v2 FROM MYSQL; CACHE INDEX t1 KEY (PRIMARY), t2 INDEX (PRIMARY) IN `default`; GRANT role_a, role_b TO user_a, user_b; CREATE PROCEDURE p() BEGIN DECLARE v_a, v_b INT; DO v_a, v_b; END;",
             &[
                 ListOwnerKind::UpdateTargets,
                 ListOwnerKind::AlterActions,

src/ui/sql_editor/formatter.rs

@@ -16746,7 +16746,9 @@ impl SqlEditorWidget {
                         (
                             Some("ANALYZE" | "CHECK" | "CHECKSUM" | "OPTIMIZE" | "REPAIR"),
                             "TABLE",
-                        ) => Some(ListOwnerKind::MaintenanceTables),
+                        )
+                        | (Some("CHECK" | "REPAIR"), "VIEW")
+                        | (Some("CACHE"), "INDEX") => Some(ListOwnerKind::MaintenanceTables),
                         (Some("CREATE" | "ALTER" | "DROP"), "USER" | "ROLE") => {
                             Some(ListOwnerKind::AccountTargets)
                         }