자동 포멧팅 기능 개선

Author: letspurify-ux

src/db/connection.rs

@@ -653,6 +653,18 @@ impl DatabaseType {
         backend_for(self).supports_mysql_delimiter_commands()
     }
 
+    pub(crate) fn supports_explicit_analytic_null_treatment(self) -> bool {
+        backend_for(self).supports_explicit_analytic_null_treatment()
+    }
+
+    pub(crate) fn uses_mysql_analytic_null_treatment_rules(self) -> bool {
+        backend_for(self).uses_mysql_analytic_null_treatment_rules()
+    }
+
+    pub(crate) fn supports_trailing_select_into_after_set_limit(self) -> bool {
+        backend_for(self).supports_trailing_select_into_after_set_limit()
+    }
+
     pub(crate) fn preserves_quoted_routine_lookup_spelling(self) -> bool {
         backend_for(self).preserves_quoted_routine_lookup_spelling()
     }
@@ -1968,6 +1980,9 @@ pub(crate) trait DbBackend: Sync {
     fn advanced_settings_form_spec(&self) -> DbAdvancedSettingsFormSpec;
     fn sql_dialect(&self) -> SqlDialect;
     fn supports_mysql_delimiter_commands(&self) -> bool;
+    fn supports_explicit_analytic_null_treatment(&self) -> bool;
+    fn uses_mysql_analytic_null_treatment_rules(&self) -> bool;
+    fn supports_trailing_select_into_after_set_limit(&self) -> bool;
     fn preserves_quoted_routine_lookup_spelling(&self) -> bool;
     fn backend_kind(&self) -> DatabaseBackendKind;
     fn cache_key(&self) -> u8;
@@ -2112,6 +2127,9 @@ struct MysqlBackend {
     display_name: &'static str,
     choice_label: &'static str,
     cache_key: u8,
+    supports_explicit_analytic_null_treatment: bool,
+    uses_mysql_analytic_null_treatment_rules: bool,
+    supports_trailing_select_into_after_set_limit: bool,
     session_time_zone_in_range: fn(SessionTimeZoneOffset) -> bool,
     session_time_zone_error_message: &'static str,
 }
@@ -2145,6 +2163,9 @@ static MYSQL_BACKEND: MysqlBackend = MysqlBackend {
     display_name: "MySQL",
     choice_label: "MySQL",
     cache_key: 1,
+    supports_explicit_analytic_null_treatment: true,
+    uses_mysql_analytic_null_treatment_rules: true,
+    supports_trailing_select_into_after_set_limit: true,
     session_time_zone_in_range: mysql_session_time_zone_in_range,
     session_time_zone_error_message:
         "MySQL session time zone must be blank or an offset from -13:59 through +14:00",
@@ -2154,6 +2175,9 @@ static MARIADB_BACKEND: MysqlBackend = MysqlBackend {
     display_name: "MariaDB",
     choice_label: "MariaDB",
     cache_key: 2,
+    supports_explicit_analytic_null_treatment: false,
+    uses_mysql_analytic_null_treatment_rules: false,
+    supports_trailing_select_into_after_set_limit: false,
     session_time_zone_in_range: mariadb_session_time_zone_in_range,
     session_time_zone_error_message:
         "MariaDB session time zone must be blank or an offset from -12:59 through +13:00",
@@ -2235,6 +2259,18 @@ impl DbBackend for OracleBackend {
         false
     }
 
+    fn supports_explicit_analytic_null_treatment(&self) -> bool {
+        true
+    }
+
+    fn uses_mysql_analytic_null_treatment_rules(&self) -> bool {
+        false
+    }
+
+    fn supports_trailing_select_into_after_set_limit(&self) -> bool {
+        false
+    }
+
     fn preserves_quoted_routine_lookup_spelling(&self) -> bool {
         true
     }
@@ -2692,6 +2728,18 @@ impl DbBackend for MysqlBackend {
         true
     }
 
+    fn supports_explicit_analytic_null_treatment(&self) -> bool {
+        self.supports_explicit_analytic_null_treatment
+    }
+
+    fn uses_mysql_analytic_null_treatment_rules(&self) -> bool {
+        self.uses_mysql_analytic_null_treatment_rules
+    }
+
+    fn supports_trailing_select_into_after_set_limit(&self) -> bool {
+        self.supports_trailing_select_into_after_set_limit
+    }
+
     fn preserves_quoted_routine_lookup_spelling(&self) -> bool {
         false
     }
@@ -6452,6 +6500,9 @@ mod tests {
             DatabaseType::from_cache_key(DatabaseType::Oracle.cache_key()),
             DatabaseType::Oracle
         );
+        assert!(DatabaseType::Oracle.supports_explicit_analytic_null_treatment());
+        assert!(!DatabaseType::Oracle.uses_mysql_analytic_null_treatment_rules());
+        assert!(!DatabaseType::Oracle.supports_trailing_select_into_after_set_limit());
 
         assert_eq!(DatabaseType::MySQL.sql_dialect(), SqlDialect::MySql);
         assert_eq!(
@@ -6462,6 +6513,9 @@ mod tests {
             DatabaseType::from_cache_key(DatabaseType::MySQL.cache_key()),
             DatabaseType::MySQL
         );
+        assert!(DatabaseType::MySQL.supports_explicit_analytic_null_treatment());
+        assert!(DatabaseType::MySQL.uses_mysql_analytic_null_treatment_rules());
+        assert!(DatabaseType::MySQL.supports_trailing_select_into_after_set_limit());
 
         assert_eq!(DatabaseType::MariaDB.sql_dialect(), SqlDialect::MySql);
         assert_eq!(
@@ -6473,6 +6527,9 @@ mod tests {
             DatabaseType::MariaDB
         );
         assert_eq!(DatabaseType::MariaDB.choice_label(), "MariaDB");
+        assert!(!DatabaseType::MariaDB.supports_explicit_analytic_null_treatment());
+        assert!(!DatabaseType::MariaDB.uses_mysql_analytic_null_treatment_rules());
+        assert!(!DatabaseType::MariaDB.supports_trailing_select_into_after_set_limit());
     }
 
     #[test]

src/ui/intellisense_context.rs

@@ -1250,7 +1250,7 @@ fn is_from_consuming_function(name: &str) -> bool {
     sql_text::is_from_consuming_function(name)
 }
 
-fn is_nth_value_from_modifier(tokens: &[SqlToken], from_idx: usize) -> bool {
+pub(crate) fn is_nth_value_from_modifier(tokens: &[SqlToken], from_idx: usize) -> bool {
     if !next_word_upper(tokens, from_idx.saturating_add(1))
         .is_some_and(|(word, _)| matches!(word.as_str(), "FIRST" | "LAST"))
     {
@@ -12775,7 +12775,9 @@ fn select_list_end_index(tokens: &[SqlToken], start: usize) -> usize {
         if is_top_level_depth(&token_depths, idx) {
             if let SqlToken::Word(w) = token {
                 let upper = w.to_ascii_uppercase();
-                if matches!(upper.as_str(), "FROM" | "INTO" | "BULK") {
+                if matches!(upper.as_str(), "FROM" | "INTO" | "BULK")
+                    && !(upper == "FROM" && is_nth_value_from_modifier(tokens, idx))
+                {
                     break;
                 }
             }

src/ui/sql_editor/format_sweep_tests.rs

@@ -4022,6 +4022,52 @@ fn formatting_sweep_mysql_non_parenthesized_lists_have_dedicated_frames() {
     }
 }
 
+#[test]
+fn formatting_sweep_mariadb_oracle_mode_declare_is_a_block_not_a_name_list() {
+    let source = "DELIMITER /\nDECLARE TYPE row_t IS RECORD(row_id INT, label_text VARCHAR2(30)); TYPE map_t IS TABLE OF row_t INDEX BY VARCHAR2(20); rows_by_key map_t; BEGIN rows_by_key('alpha') := row_t(1, 'parse'); END;\n/\nDELIMITER ;";
+    let run = format_sweep_run(source, DatabaseType::MariaDB);
+
+    assert!(
+        run.issues.is_empty(),
+        "MariaDB Oracle-mode DECLARE frame issues: {:#?}\n{}",
+        run.issues,
+        run.formatted
+    );
+    assert!(
+        run.managed_frame_kinds
+            .contains(&FormatManagedFrameKind::Block),
+        "top-level Oracle-mode DECLARE must create a block frame: {:?}\n{}",
+        run.managed_frame_kinds,
+        run.formatted
+    );
+    assert!(
+        !run.managed_list_owner_kinds
+            .contains(&ListOwnerKind::DeclarationNames),
+        "top-level Oracle-mode DECLARE must not create a MySQL declaration-name list: {:?}\n{}",
+        run.managed_list_owner_kinds,
+        run.formatted
+    );
+
+    let mysql = format_sweep_run(
+        "CREATE PROCEDURE p() BEGIN DECLARE first_value, second_value INT; SET first_value = 1; END;",
+        DatabaseType::MySQL,
+    );
+    assert!(
+        mysql.issues.is_empty(),
+        "MySQL compound DECLARE frame issues: {:#?}\n{}",
+        mysql.issues,
+        mysql.formatted
+    );
+    assert!(
+        mysql
+            .managed_list_owner_kinds
+            .contains(&ListOwnerKind::DeclarationNames),
+        "compound-block DECLARE must retain its declaration-name list: {:?}\n{}",
+        mysql.managed_list_owner_kinds,
+        mysql.formatted
+    );
+}
+
 #[test]
 fn formatting_sweep_mysql_top_level_current_diagnostics_keeps_item_list_attached() {
     let source = "SET @changed = TRUE;\nGET CURRENT DIAGNOSTICS\n  @condition_count = NUMBER,\n  @affected_rows = ROW_COUNT;\nSELECT @condition_count, @affected_rows;";

src/ui/sql_editor/formatter.rs

@@ -16641,8 +16641,7 @@ impl SqlEditorWidget {
                             line_indent,
                         );
                     }
-                    if mysql_compatible
-                        && upper == "DECLARE"
+                    if mysql_compound_declare
                         && (recent_statement_word_indices.is_empty()
                             || matches!(
                                 loop_previous_non_comment_token,