feat: improved grammar for pg-regress select.sql

biome.jsonc

@@ -11,8 +11,7 @@
 		"include": ["packages/**/*"]
 	},
 	"formatter": {
-		"enabled": true,
-		"indentStyle": "tab"
+		"enabled": true
 	},
 	"organizeImports": {
 		"enabled": true

crates/pgls_completions/Cargo.toml

@@ -27,6 +27,7 @@ tree-sitter.workspace             = true
 [dev-dependencies]
 criterion.workspace       = true
 insta.workspace           = true
+pgls_schema_cache         = { workspace = true, features = ["db"] }
 pgls_test_utils.workspace = true
 regex                     = "1.12.2"
 sqlx.workspace            = true

crates/pgls_completions/src/providers/keywords.rs

@@ -42,7 +42,9 @@ pub static ALL_KEYWORDS: &[SqlKeyword] = &[
     SqlKeyword::new("all"),
     SqlKeyword::new("alter").starts_statement(),
     SqlKeyword::new("always"),
-    SqlKeyword::new("analyze").starts_statement(),
+    SqlKeyword::new("analyze")
+        .starts_statement()
+        .require_prefix(),
     SqlKeyword::new("and").require_prefix(),
     SqlKeyword::new("any").require_prefix(),
     SqlKeyword::new("array").require_prefix(),
@@ -123,7 +125,9 @@ pub static ALL_KEYWORDS: &[SqlKeyword] = &[
     SqlKeyword::new("exclude"),
     SqlKeyword::new("execute"),
     SqlKeyword::new("exists").require_prefix(),
-    SqlKeyword::new("explain").starts_statement(),
+    SqlKeyword::new("explain")
+        .starts_statement()
+        .require_prefix(),
     SqlKeyword::new("extended"),
     SqlKeyword::new("extension"),
     SqlKeyword::new("external"),
@@ -174,7 +178,7 @@ pub static ALL_KEYWORDS: &[SqlKeyword] = &[
     SqlKeyword::new("interval").require_prefix(),
     SqlKeyword::new("into"),
     SqlKeyword::new("invoker"),
-    SqlKeyword::new("is"),
+    SqlKeyword::new("is").require_prefix(),
     SqlKeyword::new("isolation"),
     SqlKeyword::new("join"),
     SqlKeyword::new("json"),
@@ -430,6 +434,14 @@ mod tests {
         assert_complete_results(
             query.as_str(),
             vec![
+                CompletionAssertion::LabelAndKind(
+                    "create".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "drop".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
                 CompletionAssertion::LabelAndKind(
                     "insert".into(),
                     crate::CompletionItemKind::Keyword,
@@ -609,10 +621,13 @@ mod tests {
 
         assert_complete_results(
             query.as_str(),
-            vec![CompletionAssertion::LabelAndKind(
-                "from".into(),
-                crate::CompletionItemKind::Keyword,
-            )],
+            vec![
+                CompletionAssertion::LabelAndKind("for".into(), crate::CompletionItemKind::Keyword),
+                CompletionAssertion::LabelAndKind(
+                    "from".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+            ],
             Some(setup),
             &pool,
         )
@@ -635,10 +650,17 @@ mod tests {
 
         assert_complete_results(
             query.as_str(),
-            vec![CompletionAssertion::LabelAndKind(
-                "from".into(),
-                crate::CompletionItemKind::Keyword,
-            )],
+            vec![
+                CompletionAssertion::LabelAndKind(
+                    "except".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind("for".into(), crate::CompletionItemKind::Keyword),
+                CompletionAssertion::LabelAndKind(
+                    "from".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+            ],
             Some(setup),
             &pool,
         )
@@ -685,6 +707,11 @@ mod tests {
                     "cross".into(),
                     crate::CompletionItemKind::Keyword,
                 ),
+                CompletionAssertion::LabelAndKind(
+                    "except".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind("for".into(), crate::CompletionItemKind::Keyword),
                 CompletionAssertion::LabelAndKind(
                     "full".into(),
                     crate::CompletionItemKind::Keyword,
@@ -697,6 +724,10 @@ mod tests {
                     "inner".into(),
                     crate::CompletionItemKind::Keyword,
                 ),
+                CompletionAssertion::LabelAndKind(
+                    "intersect".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
                 CompletionAssertion::LabelAndKind(
                     "join".into(),
                     crate::CompletionItemKind::Keyword,
@@ -713,10 +744,30 @@ mod tests {
                     "natural".into(),
                     crate::CompletionItemKind::Keyword,
                 ),
+                CompletionAssertion::LabelAndKind(
+                    "offset".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
                 CompletionAssertion::LabelAndKind(
                     "order".into(),
                     crate::CompletionItemKind::Keyword,
                 ),
+                CompletionAssertion::LabelAndKind(
+                    "right".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "union".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "where".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "window".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
             ],
             Some(setup),
             &pool,
@@ -797,9 +848,12 @@ mod tests {
             query.as_str(),
             vec![
                 CompletionAssertion::LabelAndKind("cross".into(), CompletionItemKind::Keyword),
+                CompletionAssertion::LabelAndKind("except".into(), CompletionItemKind::Keyword),
+                CompletionAssertion::LabelAndKind("for".into(), CompletionItemKind::Keyword),
                 CompletionAssertion::LabelAndKind("full".into(), CompletionItemKind::Keyword),
                 CompletionAssertion::LabelAndKind("group".into(), CompletionItemKind::Keyword),
                 CompletionAssertion::LabelAndKind("inner".into(), CompletionItemKind::Keyword),
+                CompletionAssertion::LabelAndKind("intersect".into(), CompletionItemKind::Keyword),
                 CompletionAssertion::LabelAndKind("join".into(), CompletionItemKind::Keyword),
             ],
             Some(setup),

crates/pgls_completions/src/relevance/filtering.rs

@@ -629,10 +629,41 @@ mod tests {
 
         assert_complete_results(
             format!("select * {}", QueryWithCursorPosition::cursor_marker()).as_str(),
-            vec![CompletionAssertion::LabelAndKind(
-                "from".into(),
-                crate::CompletionItemKind::Keyword,
-            )],
+            vec![
+                CompletionAssertion::LabelAndKind(
+                    "except".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind("for".into(), crate::CompletionItemKind::Keyword),
+                CompletionAssertion::LabelAndKind(
+                    "from".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "group".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "intersect".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "limit".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "offset".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "order".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+                CompletionAssertion::LabelAndKind(
+                    "union".into(),
+                    crate::CompletionItemKind::Keyword,
+                ),
+            ],
             None,
             &pool,
         )

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__after_from_clause.snap

@@ -16,10 +16,10 @@ select email from users |
 
 Results:
 cross - cross (Keyword)
+except - except (Keyword)
+for - for (Keyword)
 full - full (Keyword)
 group - group (Keyword)
-inner - inner (Keyword)
-join - join (Keyword)
 
 --------------
 
@@ -56,10 +56,11 @@ identity_generation - information_schema.columns.identity_generation (Column)
 select email from users where id |
 
 Results:
+except - except (Keyword)
+for - for (Keyword)
 group - group (Keyword)
+intersect - intersect (Keyword)
 limit - limit (Keyword)
-order - order (Keyword)
-window - window (Keyword)
 
 --------------
 
@@ -78,10 +79,10 @@ select email from users where id = 1|
 select email from users where id = 1; |
 
 Results:
+create - create (Keyword)
+drop - drop (Keyword)
 insert - insert (Keyword)
 reset - reset (Keyword)
 select - select (Keyword)
-set - set (Keyword)
-truncate - truncate (Keyword)
 
 --------------

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_in_join_on_clause.snap

@@ -59,10 +59,10 @@ select u.id, auth.posts.content from auth.users u join auth.posts p on p.user_id
 
 Results:
 cross - cross (Keyword)
+except - except (Keyword)
+for - for (Keyword)
 full - full (Keyword)
 group - group (Keyword)
-inner - inner (Keyword)
-join - join (Keyword)
 
 --------------
 
@@ -98,10 +98,10 @@ uid - auth.users.uid (Column)
 select u.id, auth.posts.content from auth.users u join auth.posts p on p.user_id = u.uid; |
 
 Results:
+create - create (Keyword)
+drop - drop (Keyword)
 insert - insert (Keyword)
 reset - reset (Keyword)
 select - select (Keyword)
-set - set (Keyword)
-truncate - truncate (Keyword)
 
 --------------

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_quoted_columns.snap

@@ -74,14 +74,20 @@ encoding - pg_catalog.pg_database.encoding (Column)
 select "email" |
 
 Results:
+except - except (Keyword)
+for - for (Keyword)
 from - from (Keyword)
+group - group (Keyword)
+intersect - intersect (Keyword)
 
 --------------
 
 select "email" f|
 
 Results:
+for - for (Keyword)
 from - from (Keyword)
+offset - offset (Keyword)
 
 --------------
 
@@ -140,10 +146,10 @@ select "email" from "private".u|
 select "email" from "private".users; |
 
 Results:
+create - create (Keyword)
+drop - drop (Keyword)
 insert - insert (Keyword)
 reset - reset (Keyword)
 select - select (Keyword)
-set - set (Keyword)
-truncate - truncate (Keyword)
 
 --------------

crates/pgls_completions/src/snapshots/pgls_completions__test_helper__completes_quoted_columns_with_aliases.snap

@@ -85,14 +85,20 @@ select "pr"."e|"
 select "pr"."email" |
 
 Results:
+except - except (Keyword)
+for - for (Keyword)
 from - from (Keyword)
+group - group (Keyword)
+intersect - intersect (Keyword)
 
 --------------
 
 select "pr"."email" f|
 
 Results:
+for - for (Keyword)
 from - from (Keyword)
+offset - offset (Keyword)
 
 --------------
 
@@ -136,10 +142,10 @@ select "pr"."email" from private.users |
 
 Results:
 cross - cross (Keyword)
+except - except (Keyword)
+for - for (Keyword)
 full - full (Keyword)
 group - group (Keyword)
-inner - inner (Keyword)
-join - join (Keyword)
 
 --------------
 
@@ -150,10 +156,10 @@ select "pr"."email" from private.users "pr" |
 
 Results:
 cross - cross (Keyword)
+except - except (Keyword)
+for - for (Keyword)
 full - full (Keyword)
 group - group (Keyword)
-inner - inner (Keyword)
-join - join (Keyword)
 
 --------------