시그니처 기능 개선

Author: letspurify-ux

src/sql_text.rs

@@ -381,6 +381,7 @@ pub const ORACLE_SQL_KEYWORDS: &[&str] = &[
     "ONE",
     "ONLY",
     "OPEN",
+    "OPERATOR",
     "OPTIMIZER_MODE",
     "OR",
     "ORDER",

src/ui/builtin_signatures.rs

@@ -7168,6 +7168,7 @@ pub const MARIADB_FUNCTIONS: &[&str] = &[
     "EXTRACTVALUE",
     "FIELD",
     "FIND_IN_SET",
+    "FIRST_VALUE",
     "FLOOR",
     "FORMAT",
     "FORMAT_BYTES",
@@ -7256,11 +7257,13 @@ pub const MARIADB_FUNCTIONS: &[&str] = &[
     "JSON_VALID",
     "JSON_VALUE",
     "KDF",
+    "LAG",
     "LASTVAL",
     "LAST_DAY",
     "LAST_INSERT_ID",
     "LAST_VALUE",
     "LCASE",
+    "LEAD",
     "LEAST",
     "LEFT",
     "LENGTH",
@@ -7323,6 +7326,7 @@ pub const MARIADB_FUNCTIONS: &[&str] = &[
     "NATURAL_SORT_KEY",
     "NEXTVAL",
     "NOW",
+    "NTH_VALUE",
     "NTILE",
     "NULLIF",
     "NUMGEOMETRIES",
@@ -7362,6 +7366,7 @@ pub const MARIADB_FUNCTIONS: &[&str] = &[
     "REGEXP_REPLACE",
     "REGEXP_SUBSTR",
     "RELEASE_LOCK",
+    "REPLACE",
     "REVERSE",
     "RIGHT",
     "ROUND",
@@ -7515,6 +7520,7 @@ pub const MARIADB_FUNCTIONS: &[&str] = &[
     "UUID_SHORT",
     "UUID_V4",
     "UUID_V7",
+    "VALUES",
     "VARIANCE",
     "VAR_POP",
     "VAR_SAMP",
@@ -8254,6 +8260,13 @@ const MARIADB_SIGNATURES: &[BuiltinSignature] = &[
         ],
         argument_separator_keywords: &[],
     },
+    BuiltinSignature {
+        name: "FIRST_VALUE",
+        syntaxes: &[
+            "FIRST_VALUE(expr) OVER ( [ PARTITION BY partition_expression ] [ ORDER BY order_list ] )",
+        ],
+        argument_separator_keywords: &[],
+    },
     BuiltinSignature {
         name: "FLOOR",
         syntaxes: &[
@@ -8871,6 +8884,13 @@ const MARIADB_SIGNATURES: &[BuiltinSignature] = &[
         ],
         argument_separator_keywords: &[],
     },
+    BuiltinSignature {
+        name: "LAG",
+        syntaxes: &[
+            "LAG(expr[, offset]) OVER ( [ PARTITION BY partition_expression ] [ ORDER BY order_list ] )",
+        ],
+        argument_separator_keywords: &[],
+    },
     BuiltinSignature {
         name: "LASTVAL",
         syntaxes: &[
@@ -8907,6 +8927,13 @@ const MARIADB_SIGNATURES: &[BuiltinSignature] = &[
         ],
         argument_separator_keywords: &[],
     },
+    BuiltinSignature {
+        name: "LEAD",
+        syntaxes: &[
+            "LEAD(expr[, offset]) OVER ( [ PARTITION BY partition_expression ] [ ORDER BY order_list ] )",
+        ],
+        argument_separator_keywords: &[],
+    },
     BuiltinSignature {
         name: "LEAST",
         syntaxes: &[
@@ -9341,6 +9368,13 @@ const MARIADB_SIGNATURES: &[BuiltinSignature] = &[
         ],
         argument_separator_keywords: &[],
     },
+    BuiltinSignature {
+        name: "NTH_VALUE",
+        syntaxes: &[
+            "NTH_VALUE(expr, num_row) OVER ( [ PARTITION BY partition_expression ] [ ORDER BY order_list ] )",
+        ],
+        argument_separator_keywords: &[],
+    },
     BuiltinSignature {
         name: "NTILE",
         syntaxes: &[
@@ -9614,6 +9648,13 @@ const MARIADB_SIGNATURES: &[BuiltinSignature] = &[
         ],
         argument_separator_keywords: &[],
     },
+    BuiltinSignature {
+        name: "REPLACE",
+        syntaxes: &[
+            "REPLACE(str,from_str,to_str)",
+        ],
+        argument_separator_keywords: &[],
+    },
     BuiltinSignature {
         name: "REVERSE",
         syntaxes: &[
@@ -10695,6 +10736,13 @@ const MARIADB_SIGNATURES: &[BuiltinSignature] = &[
         ],
         argument_separator_keywords: &[],
     },
+    BuiltinSignature {
+        name: "VALUES",
+        syntaxes: &[
+            "VALUES(col_name)",
+        ],
+        argument_separator_keywords: &[],
+    },
     BuiltinSignature {
         name: "VARIANCE",
         syntaxes: &[

src/ui/builtin_signatures_live_tests.rs

@@ -32,7 +32,7 @@ fn assert_catalog(db_type: DatabaseType, names: &[&str], expected_len: usize) {
 fn builtin_signature_catalogs_match_official_manual_indices() {
     assert_catalog(DatabaseType::Oracle, ORACLE_FUNCTIONS, 463);
     assert_catalog(DatabaseType::MySQL, MYSQL_FUNCTIONS, 408);
-    assert_catalog(DatabaseType::MariaDB, MARIADB_FUNCTIONS, 469);
+    assert_catalog(DatabaseType::MariaDB, MARIADB_FUNCTIONS, 475);
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -961,5 +961,5 @@ fn mysql_builtin_function_signatures_execute_live() {
 #[test]
 #[ignore = "requires local MariaDB 12.2 via SPACE_QUERY_TEST_MYSQL_* environment variables"]
 fn mariadb_builtin_function_signatures_execute_live() {
-    run_mysql_catalog_live(DatabaseType::MariaDB, MARIADB_FUNCTIONS, 469);
+    run_mysql_catalog_live(DatabaseType::MariaDB, MARIADB_FUNCTIONS, 475);
 }

src/ui/intellisense.rs

@@ -31,6 +31,7 @@ pub static MARIADB_FUNCTIONS_SET: once_cell::sync::Lazy<std::collections::HashSe
 
 const FUNCTION_SUFFIX: &str = "()";
 const ORACLE_BUILTIN_PACKAGES: &[&str] = &[
+    "DBMS_DB_VERSION",
     "DBMS_OUTPUT",
     "DBMS_LOB",
     "DBMS_SQL",
@@ -2055,9 +2056,11 @@ impl IntellisenseData {
             "JAVA CLASS"
         } else if has(&self.java_resource_entries) {
             "JAVA RESOURCE"
+        } else if has(&self.schema_entries) {
+            "SCHEMA"
         } else if has(&self.user_entries) {
             "USER"
-        } else if self.is_catalog_keyword(upper.as_str(), db_type) {
+        } else if self.is_catalog_keyword_suggestion(upper.as_str(), db_type) {
             "KEYWORD"
         } else {
             return None;
@@ -2070,6 +2073,18 @@ impl IntellisenseData {
         keywords.binary_search(&upper).is_ok()
     }
 
+    fn is_catalog_keyword_suggestion(
+        &self,
+        upper: &str,
+        db_type: Option<crate::db::DatabaseType>,
+    ) -> bool {
+        self.is_catalog_keyword(upper, db_type)
+            || (upper.contains(' ')
+                && upper
+                    .split_ascii_whitespace()
+                    .all(|word| self.is_catalog_keyword(word, db_type)))
+    }
+
     /// True when `upper` (an upper-cased token) is a reserved language keyword for
     /// the dialect. Lets IntelliSense tell a base-catalog keyword apart from a
     /// column/object name when filtering expression completions.