@questdb/sql-parser 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 
 
+## 0.1.5 - 2026.03.18
+### Fixed
+boost expression operators over clause keywords in WHERE context [#15](https://github.com/questdb/sql-parser/pull/15)
+
+
+## 0.1.4 - 2026.03.17
+### Added
+- Compound JOIN suggestions: suggest "LEFT JOIN", "ASOF JOIN" etc. as single completions instead of bare keywords [#13](https://github.com/questdb/sql-parser/pull/13)
+- CTE grammar: extract `selectBody` rule so DECLARE/WITH are not suggested after WITH clause [#13](https://github.com/questdb/sql-parser/pull/13)
+
+### Fixed
+- Table suggestion ranking: tables no longer interleave with columns in autocomplete [#13](https://github.com/questdb/sql-parser/pull/13)
+
+
 ## 0.1.3 - 2026.03.04
 ### Added
 - horizon join support [#9](https://github.com/questdb/sql-parser/pull/9)

package/dist/autocomplete/content-assist.d.ts

@@ -42,6 +42,8 @@ export interface ContentAssistResult {
      * context. Used by the provider to boost tables containing all these columns.
      */
     referencedColumns: Set<string>;
+    /** Whether the cursor is inside a WHERE clause expression */
+    isConditionContext: boolean;
 }
 /**
  * Extract bare column names referenced in expression context from a token list.

package/dist/autocomplete/token-classification.d.ts

@@ -13,9 +13,7 @@ export declare const IDENTIFIER_TOKENS: Set<string>;
  */
 export declare const IDENTIFIER_KEYWORD_TOKENS: Set<string>;
 /**
- * Expression-continuation operators that are valid after any expression but
- * should be deprioritized so clause-level keywords (ASC, DESC, LIMIT, etc.)
- * appear first in the suggestion list.
+ * Expression-level operators and keywords (as opposed to clause-level keywords).
  */
 export declare const EXPRESSION_OPERATORS: Set<string>;
 /**

package/dist/index.cjs

@@ -1275,9 +1275,8 @@ var QuestDBParser = class extends import_chevrotain3.CstParser {
           ALT: () => this.SUBRULE(this.updateStatement)
         },
         {
-          // SELECT: delegate to selectStatement (its optional declareClause/
-          // withClause simply won't match since WITH was already consumed)
-          ALT: () => this.SUBRULE(this.selectStatement)
+          // SELECT after WITH: no DECLARE/WITH prefixes allowed here
+          ALT: () => this.SUBRULE(this.selectBody)
         }
       ]);
     });
@@ -1287,6 +1286,9 @@ var QuestDBParser = class extends import_chevrotain3.CstParser {
     this.selectStatement = this.RULE("selectStatement", () => {
       this.OPTION(() => this.SUBRULE(this.declareClause));
       this.OPTION2(() => this.SUBRULE(this.withClause));
+      this.SUBRULE(this.selectBody);
+    });
+    this.selectBody = this.RULE("selectBody", () => {
       this.SUBRULE(this.simpleSelect);
       this.MANY(() => {
         this.SUBRULE(this.setOperation);
@@ -1655,17 +1657,13 @@ var QuestDBParser = class extends import_chevrotain3.CstParser {
         { ALT: () => this.CONSUME(NumberLiteral) }
       ]);
     });
-    // Standard joins: (INNER | LEFT [OUTER] | RIGHT [OUTER] | FULL [OUTER] | CROSS)? JOIN + ON
+    // Standard joins: (INNER | LEFT [OUTER] | CROSS)? JOIN + ON
     this.standardJoin = this.RULE("standardJoin", () => {
       this.OPTION(() => {
         this.OR([
           {
             ALT: () => {
-              this.OR1([
-                { ALT: () => this.CONSUME(Left) },
-                { ALT: () => this.CONSUME(Right) },
-                { ALT: () => this.CONSUME(Full) }
-              ]);
+              this.CONSUME(Left);
               this.OPTION1(() => this.CONSUME(Outer));
             }
           },
@@ -4796,8 +4794,8 @@ var QuestDBVisitor = class extends BaseVisitor {
       inner = this.visit(ctx.insertStatement);
     } else if (ctx.updateStatement) {
       inner = this.visit(ctx.updateStatement);
-    } else if (ctx.selectStatement) {
-      inner = this.visit(ctx.selectStatement);
+    } else if (ctx.selectBody) {
+      inner = this.visit(ctx.selectBody);
     } else {
       throw new Error("withStatement: expected insert, update, or select");
     }
@@ -4808,13 +4806,17 @@ var QuestDBVisitor = class extends BaseVisitor {
   // SELECT Statement
   // ==========================================================================
   selectStatement(ctx) {
-    const result = this.visit(ctx.simpleSelect);
+    const result = this.visit(ctx.selectBody);
     if (ctx.declareClause) {
       result.declare = this.visit(ctx.declareClause);
     }
     if (ctx.withClause) {
       result.with = this.visit(ctx.withClause);
     }
+    return result;
+  }
+  selectBody(ctx) {
+    const result = this.visit(ctx.simpleSelect);
     if (ctx.setOperation && ctx.setOperation.length > 0) {
       result.setOperations = ctx.setOperation.map(
         (op) => this.visit(op)
@@ -5160,8 +5162,6 @@ var QuestDBVisitor = class extends BaseVisitor {
     };
     if (ctx.Inner) result.joinType = "inner";
     else if (ctx.Left) result.joinType = "left";
-    else if (ctx.Right) result.joinType = "right";
-    else if (ctx.Full) result.joinType = "full";
     else if (ctx.Cross) result.joinType = "cross";
     if (ctx.Outer) result.outer = true;
     if (ctx.expression) {
@@ -9210,18 +9210,11 @@ var EXPRESSION_OPERATORS = /* @__PURE__ */ new Set([
   "Like",
   "Ilike",
   "Within",
-  // Subquery/set operators
   "All",
   "Any",
   "Some",
-  // Expression-start keywords that continue an expression context
   "Case",
-  "Cast",
-  // Query connectors — valid after any complete query but should not
-  // overshadow clause-level keywords the user is more likely typing.
-  "Union",
-  "Except",
-  "Intersect"
+  "Cast"
 ]);
 var PUNCTUATION_TOKENS = /* @__PURE__ */ new Set([
   "LParen",
@@ -9742,7 +9735,15 @@ function computeSuggestions(tokens) {
       }
     }
   }
-  return { nextTokenTypes: result, suggestColumns, suggestTables };
+  const isConditionContext = effectiveSuggestions.some(
+    (s) => EXPRESSION_OPERATORS.has(s.nextTokenType.name) && s.ruleStack.includes("whereClause")
+  );
+  return {
+    nextTokenTypes: result,
+    suggestColumns,
+    suggestTables,
+    isConditionContext
+  };
 }
 function inferTableFromQualifiedRef(tokensBefore, isMidWord) {
   const effective = isMidWord ? tokensBefore.slice(0, -1) : tokensBefore;
@@ -9797,7 +9798,8 @@ function getContentAssist(fullSql, cursorOffset) {
         lexErrors: [],
         suggestColumns: false,
         suggestTables: false,
-        referencedColumns: /* @__PURE__ */ new Set()
+        referencedColumns: /* @__PURE__ */ new Set(),
+        isConditionContext: false
       };
     }
   }
@@ -9810,11 +9812,13 @@ function getContentAssist(fullSql, cursorOffset) {
   let nextTokenTypes = [];
   let suggestColumns = false;
   let suggestTables = false;
+  let isConditionContext = false;
   try {
     const computed = computeSuggestions(tokensForAssist);
     nextTokenTypes = computed.nextTokenTypes;
     suggestColumns = computed.suggestColumns;
     suggestTables = computed.suggestTables;
+    isConditionContext = computed.isConditionContext;
   } catch (e) {
   }
   const { tables: tablesInScope, cteColumns } = extractTables(
@@ -9868,7 +9872,8 @@ function getContentAssist(fullSql, cursorOffset) {
     qualifiedTableRef: qualifiedRef?.table,
     suggestColumns,
     suggestTables,
-    referencedColumns
+    referencedColumns,
+    isConditionContext
   };
 }
 function getNextValidTokens(sql) {
@@ -10299,6 +10304,17 @@ function getAllColumns(schema) {
   }
   return columns;
 }
+var JOIN_COMPOUND_MAP = /* @__PURE__ */ new Map([
+  ["Left", "LEFT JOIN"],
+  ["Inner", "INNER JOIN"],
+  ["Cross", "CROSS JOIN"],
+  ["Asof", "ASOF JOIN"],
+  ["Lt", "LT JOIN"],
+  ["Splice", "SPLICE JOIN"],
+  ["Window", "WINDOW JOIN"],
+  ["Horizon", "HORIZON JOIN"],
+  ["Outer", "OUTER JOIN"]
+]);
 function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
   const suggestions = [];
   const seenKeywords = /* @__PURE__ */ new Set();
@@ -10306,6 +10322,7 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
   const includeColumns = options?.includeColumns ?? true;
   const includeTables = options?.includeTables ?? true;
   const isMidWord = options?.isMidWord ?? false;
+  const isJoinContext = tokenTypes.some((t) => t.name === "Join");
   for (const tokenType of tokenTypes) {
     const name = tokenType.name;
     if (SKIP_TOKENS.has(name)) {
@@ -10318,19 +10335,31 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
     if (name === "Identifier" || name === "QuotedIdentifier") {
       continue;
     }
+    if (isJoinContext && JOIN_COMPOUND_MAP.has(name)) {
+      const compound = JOIN_COMPOUND_MAP.get(name);
+      if (seenKeywords.has(compound)) continue;
+      seenKeywords.add(compound);
+      suggestions.push({
+        label: compound,
+        kind: "keyword" /* Keyword */,
+        insertText: compound,
+        filterText: compound.toLowerCase(),
+        priority: 2 /* Medium */
+      });
+      continue;
+    }
     const keyword = tokenNameToKeyword(name);
     if (seenKeywords.has(keyword)) {
       continue;
     }
     seenKeywords.add(keyword);
     const kind = "keyword" /* Keyword */;
-    const priority = EXPRESSION_OPERATORS.has(name) ? 3 /* MediumLow */ : 2 /* Medium */;
     suggestions.push({
       label: keyword,
       kind,
       insertText: keyword,
       filterText: keyword.toLowerCase(),
-      priority
+      priority: 2 /* Medium */
     });
   }
   if (expectsIdentifier) {
@@ -10440,6 +10469,20 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
 }
 
 // src/autocomplete/provider.ts
+var EXPRESSION_OPERATOR_LABELS = new Set(
+  [...EXPRESSION_OPERATORS].map(tokenNameToKeyword)
+);
+function isSchemaColumn(image, tablesInScope, schema) {
+  const nameLower = image.toLowerCase();
+  for (const ref of tablesInScope) {
+    const cols = schema.columns[ref.table.toLowerCase()];
+    if (cols?.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  for (const cols of Object.values(schema.columns)) {
+    if (cols.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  return false;
+}
 var TABLE_NAME_TOKENS = /* @__PURE__ */ new Set([
   "From",
   "Join",
@@ -10478,7 +10521,7 @@ function rankTableSuggestions(suggestions, referencedColumns, columnIndex) {
     if (s.kind !== "table" /* Table */) continue;
     const score = scores.get(s.label.toLowerCase());
     if (score === void 0) continue;
-    s.priority = score === referencedColumns.size ? 1 /* High */ : 2 /* Medium */;
+    s.priority = score === referencedColumns.size ? 2 /* Medium */ : 3 /* MediumLow */;
   }
 }
 function getLastSignificantTokens(tokens) {
@@ -10516,7 +10559,8 @@ function createAutocompleteProvider(schema) {
         qualifiedTableRef,
         suggestColumns,
         suggestTables,
-        referencedColumns
+        referencedColumns,
+        isConditionContext
       } = getContentAssist(query, cursorOffset);
       const effectiveSchema = Object.keys(cteColumns).length > 0 ? {
         ...normalizedSchema,
@@ -10557,6 +10601,30 @@ function createAutocompleteProvider(schema) {
         if (suggestTables) {
           rankTableSuggestions(suggestions, referencedColumns, columnIndex);
         }
+        if (isConditionContext) {
+          const hasExpressionOperators = nextTokenTypes.some(
+            (t) => EXPRESSION_OPERATORS.has(t.name)
+          );
+          if (hasExpressionOperators) {
+            const effectiveTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;
+            const lastToken = effectiveTokens[effectiveTokens.length - 1];
+            const lastTokenName = lastToken?.tokenType?.name;
+            if (lastTokenName && !SKIP_TOKENS.has(lastTokenName) && !PUNCTUATION_TOKENS.has(lastTokenName) && isSchemaColumn(
+              lastToken.image,
+              effectiveTablesInScope,
+              effectiveSchema
+            )) {
+              for (const s of suggestions) {
+                if (s.kind !== "keyword" /* Keyword */) continue;
+                if (s.label === "IN") {
+                  s.priority = 1 /* High */;
+                } else if (!EXPRESSION_OPERATOR_LABELS.has(s.label)) {
+                  s.priority = 3 /* MediumLow */;
+                }
+              }
+            }
+          }
+        }
         return suggestions;
       }
       const fallbackTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;

package/dist/index.js

@@ -1215,9 +1215,8 @@ var QuestDBParser = class extends CstParser {
           ALT: () => this.SUBRULE(this.updateStatement)
         },
         {
-          // SELECT: delegate to selectStatement (its optional declareClause/
-          // withClause simply won't match since WITH was already consumed)
-          ALT: () => this.SUBRULE(this.selectStatement)
+          // SELECT after WITH: no DECLARE/WITH prefixes allowed here
+          ALT: () => this.SUBRULE(this.selectBody)
         }
       ]);
     });
@@ -1227,6 +1226,9 @@ var QuestDBParser = class extends CstParser {
     this.selectStatement = this.RULE("selectStatement", () => {
       this.OPTION(() => this.SUBRULE(this.declareClause));
       this.OPTION2(() => this.SUBRULE(this.withClause));
+      this.SUBRULE(this.selectBody);
+    });
+    this.selectBody = this.RULE("selectBody", () => {
       this.SUBRULE(this.simpleSelect);
       this.MANY(() => {
         this.SUBRULE(this.setOperation);
@@ -1595,17 +1597,13 @@ var QuestDBParser = class extends CstParser {
         { ALT: () => this.CONSUME(NumberLiteral) }
       ]);
     });
-    // Standard joins: (INNER | LEFT [OUTER] | RIGHT [OUTER] | FULL [OUTER] | CROSS)? JOIN + ON
+    // Standard joins: (INNER | LEFT [OUTER] | CROSS)? JOIN + ON
     this.standardJoin = this.RULE("standardJoin", () => {
       this.OPTION(() => {
         this.OR([
           {
             ALT: () => {
-              this.OR1([
-                { ALT: () => this.CONSUME(Left) },
-                { ALT: () => this.CONSUME(Right) },
-                { ALT: () => this.CONSUME(Full) }
-              ]);
+              this.CONSUME(Left);
               this.OPTION1(() => this.CONSUME(Outer));
             }
           },
@@ -4736,8 +4734,8 @@ var QuestDBVisitor = class extends BaseVisitor {
       inner = this.visit(ctx.insertStatement);
     } else if (ctx.updateStatement) {
       inner = this.visit(ctx.updateStatement);
-    } else if (ctx.selectStatement) {
-      inner = this.visit(ctx.selectStatement);
+    } else if (ctx.selectBody) {
+      inner = this.visit(ctx.selectBody);
     } else {
       throw new Error("withStatement: expected insert, update, or select");
     }
@@ -4748,13 +4746,17 @@ var QuestDBVisitor = class extends BaseVisitor {
   // SELECT Statement
   // ==========================================================================
   selectStatement(ctx) {
-    const result = this.visit(ctx.simpleSelect);
+    const result = this.visit(ctx.selectBody);
     if (ctx.declareClause) {
       result.declare = this.visit(ctx.declareClause);
     }
     if (ctx.withClause) {
       result.with = this.visit(ctx.withClause);
     }
+    return result;
+  }
+  selectBody(ctx) {
+    const result = this.visit(ctx.simpleSelect);
     if (ctx.setOperation && ctx.setOperation.length > 0) {
       result.setOperations = ctx.setOperation.map(
         (op) => this.visit(op)
@@ -5100,8 +5102,6 @@ var QuestDBVisitor = class extends BaseVisitor {
     };
     if (ctx.Inner) result.joinType = "inner";
     else if (ctx.Left) result.joinType = "left";
-    else if (ctx.Right) result.joinType = "right";
-    else if (ctx.Full) result.joinType = "full";
     else if (ctx.Cross) result.joinType = "cross";
     if (ctx.Outer) result.outer = true;
     if (ctx.expression) {
@@ -9150,18 +9150,11 @@ var EXPRESSION_OPERATORS = /* @__PURE__ */ new Set([
   "Like",
   "Ilike",
   "Within",
-  // Subquery/set operators
   "All",
   "Any",
   "Some",
-  // Expression-start keywords that continue an expression context
   "Case",
-  "Cast",
-  // Query connectors — valid after any complete query but should not
-  // overshadow clause-level keywords the user is more likely typing.
-  "Union",
-  "Except",
-  "Intersect"
+  "Cast"
 ]);
 var PUNCTUATION_TOKENS = /* @__PURE__ */ new Set([
   "LParen",
@@ -9682,7 +9675,15 @@ function computeSuggestions(tokens) {
       }
     }
   }
-  return { nextTokenTypes: result, suggestColumns, suggestTables };
+  const isConditionContext = effectiveSuggestions.some(
+    (s) => EXPRESSION_OPERATORS.has(s.nextTokenType.name) && s.ruleStack.includes("whereClause")
+  );
+  return {
+    nextTokenTypes: result,
+    suggestColumns,
+    suggestTables,
+    isConditionContext
+  };
 }
 function inferTableFromQualifiedRef(tokensBefore, isMidWord) {
   const effective = isMidWord ? tokensBefore.slice(0, -1) : tokensBefore;
@@ -9737,7 +9738,8 @@ function getContentAssist(fullSql, cursorOffset) {
         lexErrors: [],
         suggestColumns: false,
         suggestTables: false,
-        referencedColumns: /* @__PURE__ */ new Set()
+        referencedColumns: /* @__PURE__ */ new Set(),
+        isConditionContext: false
       };
     }
   }
@@ -9750,11 +9752,13 @@ function getContentAssist(fullSql, cursorOffset) {
   let nextTokenTypes = [];
   let suggestColumns = false;
   let suggestTables = false;
+  let isConditionContext = false;
   try {
     const computed = computeSuggestions(tokensForAssist);
     nextTokenTypes = computed.nextTokenTypes;
     suggestColumns = computed.suggestColumns;
     suggestTables = computed.suggestTables;
+    isConditionContext = computed.isConditionContext;
   } catch (e) {
   }
   const { tables: tablesInScope, cteColumns } = extractTables(
@@ -9808,7 +9812,8 @@ function getContentAssist(fullSql, cursorOffset) {
     qualifiedTableRef: qualifiedRef?.table,
     suggestColumns,
     suggestTables,
-    referencedColumns
+    referencedColumns,
+    isConditionContext
   };
 }
 function getNextValidTokens(sql) {
@@ -10239,6 +10244,17 @@ function getAllColumns(schema) {
   }
   return columns;
 }
+var JOIN_COMPOUND_MAP = /* @__PURE__ */ new Map([
+  ["Left", "LEFT JOIN"],
+  ["Inner", "INNER JOIN"],
+  ["Cross", "CROSS JOIN"],
+  ["Asof", "ASOF JOIN"],
+  ["Lt", "LT JOIN"],
+  ["Splice", "SPLICE JOIN"],
+  ["Window", "WINDOW JOIN"],
+  ["Horizon", "HORIZON JOIN"],
+  ["Outer", "OUTER JOIN"]
+]);
 function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
   const suggestions = [];
   const seenKeywords = /* @__PURE__ */ new Set();
@@ -10246,6 +10262,7 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
   const includeColumns = options?.includeColumns ?? true;
   const includeTables = options?.includeTables ?? true;
   const isMidWord = options?.isMidWord ?? false;
+  const isJoinContext = tokenTypes.some((t) => t.name === "Join");
   for (const tokenType of tokenTypes) {
     const name = tokenType.name;
     if (SKIP_TOKENS.has(name)) {
@@ -10258,19 +10275,31 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
     if (name === "Identifier" || name === "QuotedIdentifier") {
       continue;
     }
+    if (isJoinContext && JOIN_COMPOUND_MAP.has(name)) {
+      const compound = JOIN_COMPOUND_MAP.get(name);
+      if (seenKeywords.has(compound)) continue;
+      seenKeywords.add(compound);
+      suggestions.push({
+        label: compound,
+        kind: "keyword" /* Keyword */,
+        insertText: compound,
+        filterText: compound.toLowerCase(),
+        priority: 2 /* Medium */
+      });
+      continue;
+    }
     const keyword = tokenNameToKeyword(name);
     if (seenKeywords.has(keyword)) {
       continue;
     }
     seenKeywords.add(keyword);
     const kind = "keyword" /* Keyword */;
-    const priority = EXPRESSION_OPERATORS.has(name) ? 3 /* MediumLow */ : 2 /* Medium */;
     suggestions.push({
       label: keyword,
       kind,
       insertText: keyword,
       filterText: keyword.toLowerCase(),
-      priority
+      priority: 2 /* Medium */
     });
   }
   if (expectsIdentifier) {
@@ -10380,6 +10409,20 @@ function buildSuggestions(tokenTypes, schema, tablesInScope, options) {
 }
 
 // src/autocomplete/provider.ts
+var EXPRESSION_OPERATOR_LABELS = new Set(
+  [...EXPRESSION_OPERATORS].map(tokenNameToKeyword)
+);
+function isSchemaColumn(image, tablesInScope, schema) {
+  const nameLower = image.toLowerCase();
+  for (const ref of tablesInScope) {
+    const cols = schema.columns[ref.table.toLowerCase()];
+    if (cols?.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  for (const cols of Object.values(schema.columns)) {
+    if (cols.some((c) => c.name.toLowerCase() === nameLower)) return true;
+  }
+  return false;
+}
 var TABLE_NAME_TOKENS = /* @__PURE__ */ new Set([
   "From",
   "Join",
@@ -10418,7 +10461,7 @@ function rankTableSuggestions(suggestions, referencedColumns, columnIndex) {
     if (s.kind !== "table" /* Table */) continue;
     const score = scores.get(s.label.toLowerCase());
     if (score === void 0) continue;
-    s.priority = score === referencedColumns.size ? 1 /* High */ : 2 /* Medium */;
+    s.priority = score === referencedColumns.size ? 2 /* Medium */ : 3 /* MediumLow */;
   }
 }
 function getLastSignificantTokens(tokens) {
@@ -10456,7 +10499,8 @@ function createAutocompleteProvider(schema) {
         qualifiedTableRef,
         suggestColumns,
         suggestTables,
-        referencedColumns
+        referencedColumns,
+        isConditionContext
       } = getContentAssist(query, cursorOffset);
       const effectiveSchema = Object.keys(cteColumns).length > 0 ? {
         ...normalizedSchema,
@@ -10497,6 +10541,30 @@ function createAutocompleteProvider(schema) {
         if (suggestTables) {
           rankTableSuggestions(suggestions, referencedColumns, columnIndex);
         }
+        if (isConditionContext) {
+          const hasExpressionOperators = nextTokenTypes.some(
+            (t) => EXPRESSION_OPERATORS.has(t.name)
+          );
+          if (hasExpressionOperators) {
+            const effectiveTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;
+            const lastToken = effectiveTokens[effectiveTokens.length - 1];
+            const lastTokenName = lastToken?.tokenType?.name;
+            if (lastTokenName && !SKIP_TOKENS.has(lastTokenName) && !PUNCTUATION_TOKENS.has(lastTokenName) && isSchemaColumn(
+              lastToken.image,
+              effectiveTablesInScope,
+              effectiveSchema
+            )) {
+              for (const s of suggestions) {
+                if (s.kind !== "keyword" /* Keyword */) continue;
+                if (s.label === "IN") {
+                  s.priority = 1 /* High */;
+                } else if (!EXPRESSION_OPERATOR_LABELS.has(s.label)) {
+                  s.priority = 3 /* MediumLow */;
+                }
+              }
+            }
+          }
+        }
         return suggestions;
       }
       const fallbackTokens = isMidWord && tokensBefore.length > 0 ? tokensBefore.slice(0, -1) : tokensBefore;

package/dist/parser/ast.d.ts

@@ -603,7 +603,7 @@ export interface TableRef extends AstNode {
 }
 export interface JoinClause extends AstNode {
     type: "join";
-    joinType?: "inner" | "left" | "right" | "full" | "cross" | "asof" | "lt" | "splice" | "window" | "horizon";
+    joinType?: "inner" | "left" | "cross" | "asof" | "lt" | "splice" | "window" | "horizon";
     outer?: boolean;
     table: TableRef;
     on?: Expression;

package/dist/parser/parser.d.ts

@@ -13,6 +13,7 @@ declare class QuestDBParser extends CstParser {
     statement: import("chevrotain").ParserMethod<[], import("chevrotain").CstNode>;
     private withStatement;
     private selectStatement;
+    private selectBody;
     private withClause;
     private cteDefinition;
     private simpleSelect;

package/dist/parser/visitor.d.ts

@@ -1,5 +1,5 @@
 import * as AST from "./ast";
-import type { AddUserStatementCstChildren, AdditiveExpressionCstChildren, AlignToClauseCstChildren, AlterGroupStatementCstChildren, AlterMaterializedViewActionCstChildren, AlterMaterializedViewStatementCstChildren, AlterServiceAccountStatementCstChildren, AlterStatementCstChildren, AlterTableActionCstChildren, AlterTableStatementCstChildren, AlterUserActionCstChildren, AlterUserStatementCstChildren, AlterViewStatementCstChildren, AndExpressionCstChildren, ArrayBracketBodyCstChildren, ArrayElementCstChildren, ArrayLiteralCstChildren, ArraySubscriptCstChildren, AsofLtJoinCstChildren, AssumeServiceAccountStatementCstChildren, BackupStatementCstChildren, BatchClauseCstChildren, BitAndExpressionCstChildren, BitOrExpressionCstChildren, BitXorExpressionCstChildren, BooleanLiteralCstChildren, CancelQueryStatementCstChildren, CaseExpressionCstChildren, CastDefinitionCstChildren, CastExpressionCstChildren, CheckpointStatementCstChildren, ColumnDefinitionCstChildren, ColumnRefCstChildren, CompileViewStatementCstChildren, ConcatExpressionCstChildren, Ipv4ContainmentExpressionCstChildren, ConvertPartitionTargetCstChildren, CopyCancelCstChildren, CopyFromCstChildren, CopyOptionCstChildren, CopyOptionsCstChildren, CopyStatementCstChildren, CopyToCstChildren, CreateGroupStatementCstChildren, CreateMaterializedViewBodyCstChildren, CreateServiceAccountStatementCstChildren, CreateStatementCstChildren, CreateTableBodyCstChildren, CreateUserStatementCstChildren, CreateViewBodyCstChildren, CteDefinitionCstChildren, DataTypeCstChildren, DeclareAssignmentCstChildren, DeclareClauseCstChildren, DedupClauseCstChildren, DropGroupStatementCstChildren, DropMaterializedViewStatementCstChildren, DropServiceAccountStatementCstChildren, DropStatementCstChildren, DropTableStatementCstChildren, DropUserStatementCstChildren, DropViewStatementCstChildren, DurationExpressionCstChildren, EqualityExpressionCstChildren, ExitServiceAccountStatementCstChildren, ExplainStatementCstChildren, ExpressionCstChildren, FillClauseCstChildren, FillValueCstChildren, FromClauseCstChildren, FromToClauseCstChildren, FunctionCallCstChildren, FunctionNameCstChildren, GrantAssumeServiceAccountStatementCstChildren, GrantStatementCstChildren, GrantTableTargetCstChildren, GroupByClauseCstChildren, IdentifierCstChildren, IdentifierExpressionCstChildren, ImplicitSelectBodyCstChildren, ImplicitSelectStatementCstChildren, IndexDefinitionCstChildren, InsertStatementCstChildren, IntervalValueCstChildren, JoinClauseCstChildren, LatestOnClauseCstChildren, LimitClauseCstChildren, LiteralCstChildren, MaterializedViewPartitionCstChildren, MaterializedViewPeriodCstChildren, MaterializedViewRefreshCstChildren, MultiplicativeExpressionCstChildren, NotExpressionCstChildren, OrExpressionCstChildren, OrderByClauseCstChildren, OrderByItemCstChildren, OverClauseCstChildren, PartitionPeriodCstChildren, PermissionListCstChildren, PermissionTokenCstChildren, PivotAggregationCstChildren, PivotBodyCstChildren, PivotForClauseCstChildren, PivotInValueCstChildren, PivotStatementCstChildren, PrimaryExpressionCstChildren, QualifiedNameCstChildren, QualifiedStarCstChildren, ReindexTableStatementCstChildren, RefreshMaterializedViewStatementCstChildren, RelationalExpressionCstChildren, RemoveUserStatementCstChildren, RenameTableStatementCstChildren, ResumeWalStatementCstChildren, RevokeAssumeServiceAccountStatementCstChildren, RevokeStatementCstChildren, SampleByClauseCstChildren, SelectItemCstChildren, SelectListCstChildren, SelectStatementCstChildren, SetClauseCstChildren, SetExpressionCstChildren, SetOperationCstChildren, SetTypeStatementCstChildren, ShowStatementCstChildren, SimpleSelectCstChildren, SnapshotStatementCstChildren, SpliceJoinCstChildren, HorizonJoinCstChildren, HorizonOffsetCstChildren, StandardJoinCstChildren, StatementCstChildren, StatementsCstChildren, StringOrIdentifierCstChildren, StringOrQualifiedNameCstChildren, TableFunctionCallCstChildren, TableFunctionNameCstChildren, TableNameCstChildren, TableNameOrStringCstChildren, TableParamCstChildren, TableParamNameCstChildren, TableRefCstChildren, TimeUnitCstChildren, TimeZoneValueCstChildren, TruncateTableStatementCstChildren, TypeCastExpressionCstChildren, UnaryExpressionCstChildren, UpdateStatementCstChildren, VacuumTableStatementCstChildren, ValuesClauseCstChildren, ValuesListCstChildren, WhereClauseCstChildren, WindowFrameBoundCstChildren, WindowFrameClauseCstChildren, WindowJoinBoundCstChildren, WindowJoinCstChildren, WindowPartitionByClauseCstChildren, WithClauseCstChildren, WithStatementCstChildren } from "./cst-types";
+import type { AddUserStatementCstChildren, AdditiveExpressionCstChildren, AlignToClauseCstChildren, AlterGroupStatementCstChildren, AlterMaterializedViewActionCstChildren, AlterMaterializedViewStatementCstChildren, AlterServiceAccountStatementCstChildren, AlterStatementCstChildren, AlterTableActionCstChildren, AlterTableStatementCstChildren, AlterUserActionCstChildren, AlterUserStatementCstChildren, AlterViewStatementCstChildren, AndExpressionCstChildren, ArrayBracketBodyCstChildren, ArrayElementCstChildren, ArrayLiteralCstChildren, ArraySubscriptCstChildren, AsofLtJoinCstChildren, AssumeServiceAccountStatementCstChildren, BackupStatementCstChildren, BatchClauseCstChildren, BitAndExpressionCstChildren, BitOrExpressionCstChildren, BitXorExpressionCstChildren, BooleanLiteralCstChildren, CancelQueryStatementCstChildren, CaseExpressionCstChildren, CastDefinitionCstChildren, CastExpressionCstChildren, CheckpointStatementCstChildren, ColumnDefinitionCstChildren, ColumnRefCstChildren, CompileViewStatementCstChildren, ConcatExpressionCstChildren, Ipv4ContainmentExpressionCstChildren, ConvertPartitionTargetCstChildren, CopyCancelCstChildren, CopyFromCstChildren, CopyOptionCstChildren, CopyOptionsCstChildren, CopyStatementCstChildren, CopyToCstChildren, CreateGroupStatementCstChildren, CreateMaterializedViewBodyCstChildren, CreateServiceAccountStatementCstChildren, CreateStatementCstChildren, CreateTableBodyCstChildren, CreateUserStatementCstChildren, CreateViewBodyCstChildren, CteDefinitionCstChildren, DataTypeCstChildren, DeclareAssignmentCstChildren, DeclareClauseCstChildren, DedupClauseCstChildren, DropGroupStatementCstChildren, DropMaterializedViewStatementCstChildren, DropServiceAccountStatementCstChildren, DropStatementCstChildren, DropTableStatementCstChildren, DropUserStatementCstChildren, DropViewStatementCstChildren, DurationExpressionCstChildren, EqualityExpressionCstChildren, ExitServiceAccountStatementCstChildren, ExplainStatementCstChildren, ExpressionCstChildren, FillClauseCstChildren, FillValueCstChildren, FromClauseCstChildren, FromToClauseCstChildren, FunctionCallCstChildren, FunctionNameCstChildren, GrantAssumeServiceAccountStatementCstChildren, GrantStatementCstChildren, GrantTableTargetCstChildren, GroupByClauseCstChildren, IdentifierCstChildren, IdentifierExpressionCstChildren, ImplicitSelectBodyCstChildren, ImplicitSelectStatementCstChildren, IndexDefinitionCstChildren, InsertStatementCstChildren, IntervalValueCstChildren, JoinClauseCstChildren, LatestOnClauseCstChildren, LimitClauseCstChildren, LiteralCstChildren, MaterializedViewPartitionCstChildren, MaterializedViewPeriodCstChildren, MaterializedViewRefreshCstChildren, MultiplicativeExpressionCstChildren, NotExpressionCstChildren, OrExpressionCstChildren, OrderByClauseCstChildren, OrderByItemCstChildren, OverClauseCstChildren, PartitionPeriodCstChildren, PermissionListCstChildren, PermissionTokenCstChildren, PivotAggregationCstChildren, PivotBodyCstChildren, PivotForClauseCstChildren, PivotInValueCstChildren, PivotStatementCstChildren, PrimaryExpressionCstChildren, QualifiedNameCstChildren, QualifiedStarCstChildren, ReindexTableStatementCstChildren, RefreshMaterializedViewStatementCstChildren, RelationalExpressionCstChildren, RemoveUserStatementCstChildren, RenameTableStatementCstChildren, ResumeWalStatementCstChildren, RevokeAssumeServiceAccountStatementCstChildren, RevokeStatementCstChildren, SampleByClauseCstChildren, SelectItemCstChildren, SelectListCstChildren, SelectBodyCstChildren, SelectStatementCstChildren, SetClauseCstChildren, SetExpressionCstChildren, SetOperationCstChildren, SetTypeStatementCstChildren, ShowStatementCstChildren, SimpleSelectCstChildren, SnapshotStatementCstChildren, SpliceJoinCstChildren, HorizonJoinCstChildren, HorizonOffsetCstChildren, StandardJoinCstChildren, StatementCstChildren, StatementsCstChildren, StringOrIdentifierCstChildren, StringOrQualifiedNameCstChildren, TableFunctionCallCstChildren, TableFunctionNameCstChildren, TableNameCstChildren, TableNameOrStringCstChildren, TableParamCstChildren, TableParamNameCstChildren, TableRefCstChildren, TimeUnitCstChildren, TimeZoneValueCstChildren, TruncateTableStatementCstChildren, TypeCastExpressionCstChildren, UnaryExpressionCstChildren, UpdateStatementCstChildren, VacuumTableStatementCstChildren, ValuesClauseCstChildren, ValuesListCstChildren, WhereClauseCstChildren, WindowFrameBoundCstChildren, WindowFrameClauseCstChildren, WindowJoinBoundCstChildren, WindowJoinCstChildren, WindowPartitionByClauseCstChildren, WithClauseCstChildren, WithStatementCstChildren } from "./cst-types";
 declare const BaseVisitor: new (...args: any[]) => import("chevrotain").ICstVisitor<any, any>;
 declare class QuestDBVisitor extends BaseVisitor {
     constructor();
@@ -8,6 +8,7 @@ declare class QuestDBVisitor extends BaseVisitor {
     statement(ctx: StatementCstChildren): AST.Statement;
     withStatement(ctx: WithStatementCstChildren): AST.Statement;
     selectStatement(ctx: SelectStatementCstChildren): AST.SelectStatement;
+    selectBody(ctx: SelectBodyCstChildren): AST.SelectStatement;
     withClause(ctx: WithClauseCstChildren): AST.CTE[];
     cteDefinition(ctx: CteDefinitionCstChildren): AST.CTE;
     simpleSelect(ctx: SimpleSelectCstChildren): AST.SelectStatement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questdb/sql-parser",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "SQL parser for QuestDB syntax using Chevrotain",
   "type": "module",
   "main": "dist/index.cjs",