seems about right…

Author: juleswritescode

crates/pgt_completions/src/providers/columns.rs

@@ -403,7 +403,7 @@ mod tests {
 
         pool.execute(setup).await.unwrap();
 
-        // test in SELECT clause
+        // // test in SELECT clause
         assert_complete_results(
             format!(
                 "select u.id, p.{} from auth.users u join auth.posts p on u.id = p.user_id;",

crates/pgt_completions/src/relevance/filtering.rs

@@ -96,7 +96,10 @@ impl CompletionFilter<'_> {
         let kind = ctx.node_under_cursor.as_ref().map(|n| n.kind())?;
 
         let is_allowed = match kind {
-            "column_identifier" => matches!(self.data, CompletionRelevanceData::Column(_)),
+            "column_identifier" => {
+                matches!(self.data, CompletionRelevanceData::Column(_))
+                    && !ctx.matches_ancestor_history(&["insert_values", "field"])
+            }
             _ => false,
         };
 

crates/pgt_treesitter/src/context/mod.rs

@@ -153,6 +153,8 @@ impl<'a> TreesitterContext<'a> {
         ctx.gather_tree_context();
         ctx.gather_info_from_ts_queries();
 
+        println!("{:#?}", ctx);
+
         ctx
     }
 
@@ -590,8 +592,7 @@ impl<'a> TreesitterContext<'a> {
                 // `node.child_by_field_id(..)` does not work as expected
                 let mut on_node = None;
                 for child in node.children(cursor) {
-                    // 28 is the id for "keyword_on"
-                    if child.kind_id() == 28 {
+                    if child.kind() == "keyword_on" {
                         on_node = Some(child);
                     }
                 }

crates/pgt_treesitter_grammar/grammar.js

@@ -264,6 +264,8 @@ module.exports = grammar({
     keyword_storage: (_) => make_keyword("storage"),
     keyword_compression: (_) => make_keyword("compression"),
 
+    keyword_overriding: () => make_keyword("overriding"),
+    keyword_system: () => make_keyword("system"),
     keyword_policy: (_) => make_keyword("policy"),
     keyword_permissive: (_) => make_keyword("permissive"),
     keyword_restrictive: (_) => make_keyword("restrictive"),
@@ -2269,33 +2271,40 @@ module.exports = grammar({
 
     insert: ($) =>
       seq(
-        choice($.keyword_insert, $.keyword_replace),
+        $.keyword_insert,
+        $.keyword_into,
+        $.object_reference,
+        optional($._alias),
+        optional(paren_list($.column_identifier, true)),
         optional(
-          choice(
-            $.keyword_low_priority,
-            $.keyword_delayed,
-            $.keyword_high_priority
+          seq(
+            $.keyword_overriding,
+            choice($.keyword_user, $.keyword_system),
+            $.keyword_value
           )
         ),
-        optional($.keyword_ignore),
-        optional(
-          choice(
-            $.keyword_into,
-            $.keyword_overwrite // Spark SQL
-          )
+        choice(
+          seq($.keyword_default, $.keyword_values),
+          $.insert_values,
+          $._select_statement
         ),
-        $.object_reference,
-        optional($.table_partition), // Spark SQL
-        optional(seq($.keyword_as, field("alias", $.any_identifier))),
-        // TODO we need a test for `insert...set`
-        choice($._insert_values, $._set_values),
-        optional(choice($._on_conflict, $._on_duplicate_key_update))
+        optional($._on_conflict)
+      ),
+
+    insert_values: ($) =>
+      comma_list(
+        seq(
+          $.keyword_values,
+          paren_list(choice($._expression, $.keyword_default), true)
+        ),
+        true
       ),
 
     _on_conflict: ($) =>
       seq(
         $.keyword_on,
         $.keyword_conflict,
+        // todo: conflict target
         seq(
           $.keyword_do,
           choice(
@@ -2305,23 +2314,8 @@ module.exports = grammar({
         )
       ),
 
-    _on_duplicate_key_update: ($) =>
-      seq(
-        $.keyword_on,
-        $.keyword_duplicate,
-        $.keyword_key,
-        $.keyword_update,
-        $.assignment_list
-      ),
-
     assignment_list: ($) => seq($.assignment, repeat(seq(",", $.assignment))),
 
-    _insert_values: ($) =>
-      seq(
-        optional(alias($._column_list, $.list)),
-        choice(seq($.keyword_values, comma_list($.list, true)), $._dml_read)
-      ),
-
     _set_values: ($) => seq($.keyword_set, comma_list($.assignment, true)),
 
     _column_list: ($) => paren_list(alias($._column, $.column), true),
@@ -2357,10 +2351,31 @@ module.exports = grammar({
         ),
         $.keyword_then,
         choice(
-          $.keyword_delete,
+          // merge_insert
+          seq(
+            $.keyword_insert,
+            optional(paren_list($.column_identifier, true)),
+            optional(
+              seq(
+                $.keyword_overriding,
+                choice($.keyword_system, $.keyword_user),
+                $.keyword_value
+              )
+            ),
+            choice(
+              seq($.keyword_default, $.keyword_values),
+              seq(
+                $.keyword_values,
+                paren_list(choice($._expression, $.keyword_default), true)
+              )
+            )
+          ),
+          // merge_update
           seq($.keyword_update, $._set_values),
-          seq($.keyword_insert, $._insert_values),
-          optional($.where)
+          // merge_delete
+          $.keyword_delete,
+
+          seq($.keyword_do, $.keyword_nothing)
         )
       ),