자동 포멧팅 기능 개선

Author: letspurify-ux

src/db/query/mysql_executor.rs

@@ -2166,7 +2166,7 @@ impl MysqlObjectBrowser {
     pub fn get_schemas(conn: &mut Conn) -> Result<Vec<String>, MysqlError> {
         let rows: Vec<String> = conn.query(
             "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA \
-             WHERE SCHEMA_NAME NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
+             WHERE SCHEMA_NAME NOT IN ('information_schema', 'mysql', 'performance_schema') \
              ORDER BY SCHEMA_NAME",
         )?;
         Ok(rows)
@@ -2182,20 +2182,20 @@ impl MysqlObjectBrowser {
                         ELSE TABLE_TYPE \
                     END AS OBJECT_TYPE \
              FROM INFORMATION_SCHEMA.TABLES \
-             WHERE TABLE_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
+             WHERE TABLE_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema') \
                AND TABLE_TYPE IN ('BASE TABLE', 'VIEW', 'SEQUENCE') \
              UNION ALL \
              SELECT ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_TYPE \
              FROM INFORMATION_SCHEMA.ROUTINES \
-             WHERE ROUTINE_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
+             WHERE ROUTINE_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema') \
              UNION ALL \
              SELECT TRIGGER_SCHEMA, TRIGGER_NAME, 'TRIGGER' \
              FROM INFORMATION_SCHEMA.TRIGGERS \
-             WHERE TRIGGER_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
+             WHERE TRIGGER_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema') \
              UNION ALL \
              SELECT EVENT_SCHEMA, EVENT_NAME, 'EVENT' \
              FROM INFORMATION_SCHEMA.EVENTS \
-             WHERE EVENT_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
+             WHERE EVENT_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema') \
              ORDER BY 1, 2, 3",
         )?;
 
@@ -2214,7 +2214,7 @@ impl MysqlObjectBrowser {
     ) -> Result<HashMap<String, Vec<String>>, MysqlError> {
         let rows: Vec<(String, String)> = conn.query(
             "SELECT TABLE_SCHEMA, TABLE_NAME FROM INFORMATION_SCHEMA.TABLES \
-             WHERE TABLE_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys') \
+             WHERE TABLE_SCHEMA NOT IN ('information_schema', 'mysql', 'performance_schema') \
                AND TABLE_TYPE IN ('BASE TABLE', 'VIEW') \
              ORDER BY 1, 2",
         )?;

src/db/query/query_tests.rs

@@ -7807,6 +7807,28 @@ fn test_set_null_command_parsed() {
     );
 }
 
+#[test]
+fn sqlplus_quoted_empty_and_whitespace_text_arguments_round_trip_semantically() {
+    let sql = "SET NULL ''\nSET COLSEP ' '\nSET NULL 'can''t render'";
+    let items = QueryExecutor::split_script_items(sql);
+
+    assert!(matches!(
+        items.first(),
+        Some(ScriptItem::ToolCommand(ToolCommand::SetNull { null_text }))
+            if null_text.is_empty()
+    ));
+    assert!(matches!(
+        items.get(1),
+        Some(ScriptItem::ToolCommand(ToolCommand::SetColSep { separator }))
+            if separator == " "
+    ));
+    assert!(matches!(
+        items.get(2),
+        Some(ScriptItem::ToolCommand(ToolCommand::SetNull { null_text }))
+            if null_text == "can't render"
+    ));
+}
+
 #[test]
 fn test_spool_file_command_parsed() {
     let sql = "SPOOL output.log";

src/db/query/script.rs

@@ -11497,7 +11497,7 @@ impl QueryExecutor {
             };
         }
 
-        let separator = rest.trim_matches('\'').trim_matches('"').to_string();
+        let separator = Self::parse_sqlplus_text_argument(rest);
         ToolCommand::SetColSep { separator }
     }
 
@@ -11511,10 +11511,26 @@ impl QueryExecutor {
             };
         }
 
-        let null_text = rest.trim_matches('\'').trim_matches('"').to_string();
+        let null_text = Self::parse_sqlplus_text_argument(rest);
         ToolCommand::SetNull { null_text }
     }
 
+    fn parse_sqlplus_text_argument(raw: &str) -> String {
+        if let Some(inner) = raw
+            .strip_prefix('\'')
+            .and_then(|value| value.strip_suffix('\''))
+        {
+            return inner.replace("''", "'");
+        }
+        if let Some(inner) = raw
+            .strip_prefix('"')
+            .and_then(|value| value.strip_suffix('"'))
+        {
+            return inner.replace("\"\"", "\"");
+        }
+        raw.to_string()
+    }
+
     fn parse_script_command(raw: &str) -> ToolCommand {
         let trimmed = raw.trim();
         let (relative_to_caller, command_label, path) = if trimmed.starts_with("@@") {

src/ui/sql_editor/format_sweep_tests.rs

@@ -4653,6 +4653,98 @@ fn mysql_declare_condition_for_clause_stays_inline() {
     );
 }
 
+#[test]
+fn wave11_mysql_insert_scalar_function_keeps_select_list_frame() {
+    let source = "SELECT ELT(2, 'alpha', 'beta') AS picked,\n       INSERT('abcdef', 2, 3, 'XY') AS spliced,\n       SUBSTRING_INDEX('a.b.c', '.', -2) AS tail_parts,\n       BIT_COUNT(255) AS bits_set;";
+    let run = format_sweep_run(source, DatabaseType::MySQL);
+
+    assert!(
+        run.issues.is_empty(),
+        "INSERT(...) must remain a scalar SELECT item: {:#?}\n{}",
+        run.issues,
+        run.formatted
+    );
+}
+
+#[test]
+fn wave11_mariadb_identified_via_or_keeps_authentication_chain_structural() {
+    let source = "CREATE OR REPLACE USER demo@localhost\n  IDENTIFIED VIA mysql_native_password USING PASSWORD('secret')\n              OR unix_socket\n  WITH MAX_QUERIES_PER_HOUR 120;";
+    let run = format_sweep_run(source, DatabaseType::MariaDB);
+
+    assert!(
+        run.issues.is_empty(),
+        "authentication-plugin OR must not become a condition connector: {:#?}\n{}",
+        run.issues,
+        run.formatted
+    );
+}
+
+#[test]
+fn wave11_oracle_create_schema_formats_embedded_schema_elements_independently() {
+    let source = "CREATE SCHEMA AUTHORIZATION system\n  CREATE TABLE demo_ledger (\n    entry_id NUMBER PRIMARY KEY,\n    amount NUMBER(9, 2))\n  CREATE VIEW demo_ledger_v AS\n    SELECT entry_id, amount FROM demo_ledger WHERE amount >= 0\n  GRANT SELECT ON demo_ledger TO PUBLIC;";
+    let run = format_sweep_run(source, DatabaseType::Oracle);
+
+    assert!(
+        run.issues.is_empty(),
+        "CREATE SCHEMA elements must remain one stable executable statement: {:#?}\n{}",
+        run.issues,
+        run.formatted
+    );
+    assert!(
+        run.formatted.contains("\n    CREATE TABLE demo_ledger")
+            && run.formatted.contains("\n    CREATE VIEW demo_ledger_v")
+            && run
+                .formatted
+                .contains("\n    GRANT SELECT ON demo_ledger TO PUBLIC;"),
+        "schema elements must be sibling children of CREATE SCHEMA:\n{}",
+        run.formatted
+    );
+}
+
+#[test]
+fn wave11_oracle_dml_hint_target_clause_is_whitespace_independent() {
+    let source = "DELETE /*+ FULL(d) */ FROM demo_ledger d\nWHERE d.amount < 0;\nINSERT /*+ APPEND_VALUES */ INTO demo_ledger (entry_id, amount)\nVALUES (9, 9);";
+    let run = format_sweep_run(source, DatabaseType::Oracle);
+
+    assert!(
+        run.issues.is_empty(),
+        "DML hints must not make target-clause indentation source-dependent: {:#?}\n{}",
+        run.issues,
+        run.formatted
+    );
+    assert!(
+        run.formatted
+            .contains("DELETE /*+ FULL(d) */\nFROM demo_ledger d"),
+        "FROM must use DELETE's owner depth after an inline hint:\n{}",
+        run.formatted
+    );
+    assert!(
+        run.formatted
+            .contains("INSERT /*+ APPEND_VALUES */\nINTO demo_ledger"),
+        "INTO must use INSERT's owner depth after an inline hint:\n{}",
+        run.formatted
+    );
+}
+
+#[test]
+fn wave11_oracle_sqlplus_empty_and_whitespace_values_remain_executable() {
+    let source =
+        "SET NULL ''\nSET COLSEP ' '\nSET TAB ON\nSELECT 'still executable' AS status FROM dual;";
+    let run = format_sweep_run(source, DatabaseType::Oracle);
+
+    assert!(
+        run.issues.is_empty(),
+        "quoted SQL*Plus values must survive formatting: {:#?}\n{}",
+        run.issues,
+        run.formatted
+    );
+    assert!(
+        run.formatted.contains("SET NULL ''") && run.formatted.contains("SET COLSEP ' '"),
+        "empty and whitespace-only values require their quotes after formatting:\n{}",
+        run.formatted
+    );
+}
+
 #[test]
 fn fetch_first_comment_continuation_stays_one_deeper_after_match_recognize_close() {
     let source = "CREATE OR REPLACE PROCEDURE p IS r SYS_REFCURSOR; BEGIN OPEN r FOR SELECT * FROM e MATCH_RECOGNIZE (PARTITION BY d ORDER BY rn MEASURES FIRST (n) AS s ONE ROW PER MATCH PATTERN (A B+) DEFINE B AS B.sal > PREV (B.sal)) FETCH FIRST /* BV */ 20 ROWS ONLY; END p;";