@questdb/sql-parser 0.1.2 → 0.1.4

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Changelog
 
 
+## 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)
+
+
 ## 0.1.2 - 2026.02.25
 ### Fixed
 - Prioritize tables with mentioned columns in the suggestions [#6](https://github.com/questdb/sql-parser/pull/6)

package/dist/grammar/index.cjs

@@ -349,12 +349,16 @@ var functions = [
   "approx_percentile",
   "arg_max",
   "arg_min",
+  "array_agg",
   "array_avg",
+  "array_build",
   "array_count",
   "array_cum_sum",
   "array_max",
   "array_min",
   "array_position",
+  "array_reverse",
+  "array_sort",
   "array_stddev",
   "array_stddev_pop",
   "array_stddev_samp",

package/dist/grammar/index.js

@@ -319,12 +319,16 @@ var functions = [
   "approx_percentile",
   "arg_max",
   "arg_min",
+  "array_agg",
   "array_avg",
+  "array_build",
   "array_count",
   "array_cum_sum",
   "array_max",
   "array_min",
   "array_position",
+  "array_reverse",
+  "array_sort",
   "array_stddev",
   "array_stddev_pop",
   "array_stddev_samp",

package/dist/index.cjs

@@ -529,9 +529,9 @@ var IDENTIFIER_KEYWORD_NAMES = new globalThis.Set([
   "Capacity",
   "Cancel",
   "Prevailing",
+  "Range",
   "Writer",
   "Materialized",
-  "Range",
   "Snapshot",
   "Unlock",
   "Refresh",
@@ -650,7 +650,6 @@ var IDENTIFIER_KEYWORD_NAMES = new globalThis.Set([
   "Every",
   "Prev",
   "Linear",
-  "Horizon",
   "Step"
 ]);
 for (const name of IDENTIFIER_KEYWORD_NAMES) {
@@ -755,6 +754,7 @@ var Grant = getToken("Grant");
 var Group = getToken("Group");
 var Groups = getToken("Groups");
 var Header = getToken("Header");
+var Horizon = getToken("Horizon");
 var Http = getToken("Http");
 var If = getToken("If");
 var Ignore = getToken("Ignore");
@@ -855,6 +855,7 @@ var Snapshot = getToken("Snapshot");
 var Splice = getToken("Splice");
 var Squash = getToken("Squash");
 var StandardConformingStrings = getToken("StandardConformingStrings");
+var Step = getToken("Step");
 var Start = getToken("Start");
 var StatisticsEnabled = getToken("StatisticsEnabled");
 var Suspend = getToken("Suspend");
@@ -1274,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)
         }
       ]);
     });
@@ -1286,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);
@@ -1533,6 +1536,7 @@ var QuestDBParser = class extends import_chevrotain3.CstParser {
         { ALT: () => this.SUBRULE(this.asofLtJoin) },
         { ALT: () => this.SUBRULE(this.spliceJoin) },
         { ALT: () => this.SUBRULE(this.windowJoin) },
+        { ALT: () => this.SUBRULE(this.horizonJoin) },
         { ALT: () => this.SUBRULE(this.standardJoin) }
       ]);
     });
@@ -1590,17 +1594,76 @@ var QuestDBParser = class extends import_chevrotain3.CstParser {
         this.CONSUME1(Prevailing);
       });
     });
-    // Standard joins: (INNER | LEFT [OUTER] | RIGHT [OUTER] | FULL [OUTER] | CROSS)? JOIN + ON
+    // HORIZON JOIN: tableName alias [ON expr] (RANGE FROM/TO/STEP | LIST (...)) AS alias
+    // Uses tableName + custom alias instead of tableRef to avoid ambiguity
+    // between implicit keyword aliases and RANGE/LIST/ON keywords.
+    this.horizonJoin = this.RULE("horizonJoin", () => {
+      this.CONSUME(Horizon);
+      this.CONSUME(Join);
+      this.SUBRULE(this.tableName);
+      this.OR1([
+        {
+          ALT: () => {
+            this.CONSUME(As);
+            this.SUBRULE(this.identifier);
+          }
+        },
+        {
+          // Implicit alias: only base Identifier, never keywords like RANGE/LIST
+          ALT: () => this.CONSUME(Identifier)
+        }
+      ]);
+      this.OPTION(() => {
+        this.CONSUME(On);
+        this.SUBRULE(this.expression);
+      });
+      this.OR2([
+        {
+          // RANGE FROM <offset> TO <offset> STEP <offset> AS <alias>
+          ALT: () => {
+            this.CONSUME(Range);
+            this.CONSUME(From);
+            this.SUBRULE(this.horizonOffset);
+            this.CONSUME(To);
+            this.SUBRULE1(this.horizonOffset);
+            this.CONSUME(Step);
+            this.SUBRULE2(this.horizonOffset);
+            this.CONSUME1(As);
+            this.SUBRULE1(this.identifier);
+          }
+        },
+        {
+          // LIST (<offset>, ...) AS <alias>
+          ALT: () => {
+            this.CONSUME(List);
+            this.CONSUME(LParen);
+            this.SUBRULE3(this.horizonOffset);
+            this.MANY(() => {
+              this.CONSUME(Comma);
+              this.SUBRULE4(this.horizonOffset);
+            });
+            this.CONSUME(RParen);
+            this.CONSUME2(As);
+            this.SUBRULE2(this.identifier);
+          }
+        }
+      ]);
+    });
+    // Horizon offset value: optional minus sign + DurationLiteral | NumberLiteral
+    this.horizonOffset = this.RULE("horizonOffset", () => {
+      this.OPTION(() => this.CONSUME(Minus));
+      this.OR([
+        { ALT: () => this.CONSUME(DurationLiteral) },
+        { ALT: () => this.CONSUME(NumberLiteral) }
+      ]);
+    });
+    // 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));
             }
           },
@@ -4731,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");
     }
@@ -4743,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)
@@ -4996,6 +5063,7 @@ var QuestDBVisitor = class extends BaseVisitor {
     if (ctx.asofLtJoin) return this.visit(ctx.asofLtJoin);
     if (ctx.spliceJoin) return this.visit(ctx.spliceJoin);
     if (ctx.windowJoin) return this.visit(ctx.windowJoin);
+    if (ctx.horizonJoin) return this.visit(ctx.horizonJoin);
     return this.visit(ctx.standardJoin);
   }
   asofLtJoin(ctx) {
@@ -5044,6 +5112,49 @@ var QuestDBVisitor = class extends BaseVisitor {
     }
     return result;
   }
+  horizonJoin(ctx) {
+    const tableRef = {
+      type: "tableRef",
+      table: this.visit(ctx.tableName)
+    };
+    if (ctx.Identifier) {
+      tableRef.alias = ctx.Identifier[0].image;
+    } else if (ctx.identifier && ctx.identifier.length > 1) {
+      tableRef.alias = this.visit(ctx.identifier[0]).parts[0];
+    }
+    const result = {
+      type: "join",
+      joinType: "horizon",
+      table: tableRef
+    };
+    if (ctx.expression) {
+      result.on = this.visit(ctx.expression);
+    }
+    if (ctx.Range) {
+      const offsets = ctx.horizonOffset;
+      result.horizonRange = {
+        from: this.visit(offsets[0]),
+        to: this.visit(offsets[1]),
+        step: this.visit(offsets[2])
+      };
+    } else if (ctx.List) {
+      result.horizonList = ctx.horizonOffset.map(
+        (o) => this.visit(o)
+      );
+    }
+    if (ctx.identifier) {
+      const lastId = ctx.identifier[ctx.identifier.length - 1];
+      result.horizonAlias = this.visit(lastId).parts[0];
+    }
+    return result;
+  }
+  horizonOffset(ctx) {
+    const sign = ctx.Minus ? "-" : "";
+    if (ctx.DurationLiteral) {
+      return sign + ctx.DurationLiteral[0].image;
+    }
+    return sign + ctx.NumberLiteral[0].image;
+  }
   standardJoin(ctx) {
     const result = {
       type: "join",
@@ -5051,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) {
@@ -7919,6 +8028,21 @@ function joinToSql(join) {
       join.prevailing === "include" ? "INCLUDE PREVAILING" : "EXCLUDE PREVAILING"
     );
   }
+  if (join.horizonRange) {
+    parts.push("RANGE FROM");
+    parts.push(join.horizonRange.from);
+    parts.push("TO");
+    parts.push(join.horizonRange.to);
+    parts.push("STEP");
+    parts.push(join.horizonRange.step);
+  }
+  if (join.horizonList) {
+    parts.push("LIST (" + join.horizonList.join(", ") + ")");
+  }
+  if (join.horizonAlias) {
+    parts.push("AS");
+    parts.push(escapeIdentifier(join.horizonAlias));
+  }
   return parts.join(" ");
 }
 function windowJoinBoundToSql(bound) {
@@ -9792,12 +9916,16 @@ var functions = [
   "approx_percentile",
   "arg_max",
   "arg_min",
+  "array_agg",
   "array_avg",
+  "array_build",
   "array_count",
   "array_cum_sum",
   "array_max",
   "array_min",
   "array_position",
+  "array_reverse",
+  "array_sort",
   "array_stddev",
   "array_stddev_pop",
   "array_stddev_samp",
@@ -10171,6 +10299,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();
@@ -10178,6 +10317,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)) {
@@ -10190,6 +10330,19 @@ 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;
@@ -10350,7 +10503,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) {

package/dist/index.js

@@ -469,9 +469,9 @@ var IDENTIFIER_KEYWORD_NAMES = new globalThis.Set([
   "Capacity",
   "Cancel",
   "Prevailing",
+  "Range",
   "Writer",
   "Materialized",
-  "Range",
   "Snapshot",
   "Unlock",
   "Refresh",
@@ -590,7 +590,6 @@ var IDENTIFIER_KEYWORD_NAMES = new globalThis.Set([
   "Every",
   "Prev",
   "Linear",
-  "Horizon",
   "Step"
 ]);
 for (const name of IDENTIFIER_KEYWORD_NAMES) {
@@ -695,6 +694,7 @@ var Grant = getToken("Grant");
 var Group = getToken("Group");
 var Groups = getToken("Groups");
 var Header = getToken("Header");
+var Horizon = getToken("Horizon");
 var Http = getToken("Http");
 var If = getToken("If");
 var Ignore = getToken("Ignore");
@@ -795,6 +795,7 @@ var Snapshot = getToken("Snapshot");
 var Splice = getToken("Splice");
 var Squash = getToken("Squash");
 var StandardConformingStrings = getToken("StandardConformingStrings");
+var Step = getToken("Step");
 var Start = getToken("Start");
 var StatisticsEnabled = getToken("StatisticsEnabled");
 var Suspend = getToken("Suspend");
@@ -1214,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)
         }
       ]);
     });
@@ -1226,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);
@@ -1473,6 +1476,7 @@ var QuestDBParser = class extends CstParser {
         { ALT: () => this.SUBRULE(this.asofLtJoin) },
         { ALT: () => this.SUBRULE(this.spliceJoin) },
         { ALT: () => this.SUBRULE(this.windowJoin) },
+        { ALT: () => this.SUBRULE(this.horizonJoin) },
         { ALT: () => this.SUBRULE(this.standardJoin) }
       ]);
     });
@@ -1530,17 +1534,76 @@ var QuestDBParser = class extends CstParser {
         this.CONSUME1(Prevailing);
       });
     });
-    // Standard joins: (INNER | LEFT [OUTER] | RIGHT [OUTER] | FULL [OUTER] | CROSS)? JOIN + ON
+    // HORIZON JOIN: tableName alias [ON expr] (RANGE FROM/TO/STEP | LIST (...)) AS alias
+    // Uses tableName + custom alias instead of tableRef to avoid ambiguity
+    // between implicit keyword aliases and RANGE/LIST/ON keywords.
+    this.horizonJoin = this.RULE("horizonJoin", () => {
+      this.CONSUME(Horizon);
+      this.CONSUME(Join);
+      this.SUBRULE(this.tableName);
+      this.OR1([
+        {
+          ALT: () => {
+            this.CONSUME(As);
+            this.SUBRULE(this.identifier);
+          }
+        },
+        {
+          // Implicit alias: only base Identifier, never keywords like RANGE/LIST
+          ALT: () => this.CONSUME(Identifier)
+        }
+      ]);
+      this.OPTION(() => {
+        this.CONSUME(On);
+        this.SUBRULE(this.expression);
+      });
+      this.OR2([
+        {
+          // RANGE FROM <offset> TO <offset> STEP <offset> AS <alias>
+          ALT: () => {
+            this.CONSUME(Range);
+            this.CONSUME(From);
+            this.SUBRULE(this.horizonOffset);
+            this.CONSUME(To);
+            this.SUBRULE1(this.horizonOffset);
+            this.CONSUME(Step);
+            this.SUBRULE2(this.horizonOffset);
+            this.CONSUME1(As);
+            this.SUBRULE1(this.identifier);
+          }
+        },
+        {
+          // LIST (<offset>, ...) AS <alias>
+          ALT: () => {
+            this.CONSUME(List);
+            this.CONSUME(LParen);
+            this.SUBRULE3(this.horizonOffset);
+            this.MANY(() => {
+              this.CONSUME(Comma);
+              this.SUBRULE4(this.horizonOffset);
+            });
+            this.CONSUME(RParen);
+            this.CONSUME2(As);
+            this.SUBRULE2(this.identifier);
+          }
+        }
+      ]);
+    });
+    // Horizon offset value: optional minus sign + DurationLiteral | NumberLiteral
+    this.horizonOffset = this.RULE("horizonOffset", () => {
+      this.OPTION(() => this.CONSUME(Minus));
+      this.OR([
+        { ALT: () => this.CONSUME(DurationLiteral) },
+        { ALT: () => this.CONSUME(NumberLiteral) }
+      ]);
+    });
+    // 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));
             }
           },
@@ -4671,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");
     }
@@ -4683,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)
@@ -4936,6 +5003,7 @@ var QuestDBVisitor = class extends BaseVisitor {
     if (ctx.asofLtJoin) return this.visit(ctx.asofLtJoin);
     if (ctx.spliceJoin) return this.visit(ctx.spliceJoin);
     if (ctx.windowJoin) return this.visit(ctx.windowJoin);
+    if (ctx.horizonJoin) return this.visit(ctx.horizonJoin);
     return this.visit(ctx.standardJoin);
   }
   asofLtJoin(ctx) {
@@ -4984,6 +5052,49 @@ var QuestDBVisitor = class extends BaseVisitor {
     }
     return result;
   }
+  horizonJoin(ctx) {
+    const tableRef = {
+      type: "tableRef",
+      table: this.visit(ctx.tableName)
+    };
+    if (ctx.Identifier) {
+      tableRef.alias = ctx.Identifier[0].image;
+    } else if (ctx.identifier && ctx.identifier.length > 1) {
+      tableRef.alias = this.visit(ctx.identifier[0]).parts[0];
+    }
+    const result = {
+      type: "join",
+      joinType: "horizon",
+      table: tableRef
+    };
+    if (ctx.expression) {
+      result.on = this.visit(ctx.expression);
+    }
+    if (ctx.Range) {
+      const offsets = ctx.horizonOffset;
+      result.horizonRange = {
+        from: this.visit(offsets[0]),
+        to: this.visit(offsets[1]),
+        step: this.visit(offsets[2])
+      };
+    } else if (ctx.List) {
+      result.horizonList = ctx.horizonOffset.map(
+        (o) => this.visit(o)
+      );
+    }
+    if (ctx.identifier) {
+      const lastId = ctx.identifier[ctx.identifier.length - 1];
+      result.horizonAlias = this.visit(lastId).parts[0];
+    }
+    return result;
+  }
+  horizonOffset(ctx) {
+    const sign = ctx.Minus ? "-" : "";
+    if (ctx.DurationLiteral) {
+      return sign + ctx.DurationLiteral[0].image;
+    }
+    return sign + ctx.NumberLiteral[0].image;
+  }
   standardJoin(ctx) {
     const result = {
       type: "join",
@@ -4991,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) {
@@ -7859,6 +7968,21 @@ function joinToSql(join) {
       join.prevailing === "include" ? "INCLUDE PREVAILING" : "EXCLUDE PREVAILING"
     );
   }
+  if (join.horizonRange) {
+    parts.push("RANGE FROM");
+    parts.push(join.horizonRange.from);
+    parts.push("TO");
+    parts.push(join.horizonRange.to);
+    parts.push("STEP");
+    parts.push(join.horizonRange.step);
+  }
+  if (join.horizonList) {
+    parts.push("LIST (" + join.horizonList.join(", ") + ")");
+  }
+  if (join.horizonAlias) {
+    parts.push("AS");
+    parts.push(escapeIdentifier(join.horizonAlias));
+  }
   return parts.join(" ");
 }
 function windowJoinBoundToSql(bound) {
@@ -9732,12 +9856,16 @@ var functions = [
   "approx_percentile",
   "arg_max",
   "arg_min",
+  "array_agg",
   "array_avg",
+  "array_build",
   "array_count",
   "array_cum_sum",
   "array_max",
   "array_min",
   "array_position",
+  "array_reverse",
+  "array_sort",
   "array_stddev",
   "array_stddev_pop",
   "array_stddev_samp",
@@ -10111,6 +10239,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();
@@ -10118,6 +10257,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)) {
@@ -10130,6 +10270,19 @@ 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;
@@ -10290,7 +10443,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) {

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";
+    joinType?: "inner" | "left" | "cross" | "asof" | "lt" | "splice" | "window" | "horizon";
     outer?: boolean;
     table: TableRef;
     on?: Expression;
@@ -616,6 +616,16 @@ export interface JoinClause extends AstNode {
     };
     /** INCLUDE/EXCLUDE PREVAILING clause for WINDOW JOIN */
     prevailing?: "include" | "exclude";
+    /** RANGE FROM/TO/STEP for HORIZON JOIN */
+    horizonRange?: {
+        from: string;
+        to: string;
+        step: string;
+    };
+    /** LIST offsets for HORIZON JOIN */
+    horizonList?: string[];
+    /** Alias for the horizon pseudo-table */
+    horizonAlias?: string;
 }
 export interface WindowJoinBound extends AstNode {
     type: "windowJoinBound";

package/dist/parser/lexer.d.ts

@@ -1,7 +1,7 @@
 import { Lexer, TokenType } from "chevrotain";
-import { IdentifierKeyword, Abort, Account, Accounts, Add, Alias, Align, All, Alter, And, Any, As, Asc, Asof, Assume, Attach, Atomic, Backup, Base, Batch, Between, Binary, Boolean, By, Bypass, Byte, Cache, Calendar, Cancel, Capacity, Cascade, Case, Cast, Char, Checkpoint, Column, Columns, Compile, Complete, CompressionCodec, CompressionLevel, CommitLag, Convert, Copy, Create, Cross, Cumulative, Current, Database, DataPageSize, Datestyle, Date, Day, Days, Decimal, Declare, Dedup, Default, DefaultTransactionReadOnly, Deferred, Delay, Delete, Delimiter, Desc, Detach, Details, Disable, Distinct, Double, Drop, Else, Enable, End, Error, Every, Except, Exclude, Exclusive, Exists, Exit, Explain, External, False, Fill, First, Float, Following, For, Foreign, Format, From, Full, Geohash, Grant, Group, Groups, Header, Hour, Hours, Http, If, Ignore, Ilike, Immediate, In, Include, Index, Inner, Insert, Incremental, Int, Integer, Intersect, Interval, Into, Ipv4, Is, Isolation, Jwk, Join, Keep, Key, Keys, Latest, Left, Length, Level, Like, Limit, Linear, List, Lock, Long, Long128, Long256, Lt, Manual, Maps, Materialized, MaxIdentifierLength, MaxUncommittedRows, Microsecond, Microseconds, Millennium, Millisecond, Milliseconds, Minute, Minutes, Month, Months, NaN, Nanosecond, Nanoseconds, No, Nocache, None, Not, Null, Nulls, O3MaxLag, Observation, Offset, On, Only, Option, Or, Order, Others, Outer, Over, Overridable, Owned, Param, Parameters, Parquet, ParquetVersion, PartitionBy, Partition, Partitions, Password, Period, Permissions, Pivot, Prepare, Preceding, Prev, Prevailing, Primary, Public, Query, Range, References, Refresh, Release, Reindex, Remove, Rename, Repair, Replace, Rest, Respect, Resume, Revoke, Right, Row, RowGroupSize, Rows, Sample, SearchPath, Second, Seconds, Select, ServerVersion, ServerVersionNum, Service, Set, Short, Show, Skip, SkipColumn, SkipRow, Snapshot, Splice, Squash, StandardConformingStrings, Start, StatisticsEnabled, String, Suspend, Symbol, System, Table, Tables, Then, Time, Timestamp, TimestampNs, To, Token, Tolerance, Transaction, TransactionIsolation, Transient, True, Truncate, Ttl, Txn, Type, Unbounded, Union, Unlock, Unpivot, Update, Upsert, User, Users, Uuid, Vacuum, Values, Varchar, Verification, View, Volume, Wal, Week, Weeks, When, Where, Window, With, Within, Writer, Year, Years, Zone, RawArrayEncoding, Uncompressed, Snappy, Gzip, Lz4, Zstd, Lz4Raw, Brotli, Lzo } from "./tokens";
+import { IdentifierKeyword, Abort, Account, Accounts, Add, Alias, Align, All, Alter, And, Any, As, Asc, Asof, Assume, Attach, Atomic, Backup, Base, Batch, Between, Binary, Boolean, By, Bypass, Byte, Cache, Calendar, Cancel, Capacity, Cascade, Case, Cast, Char, Checkpoint, Column, Columns, Compile, Complete, CompressionCodec, CompressionLevel, CommitLag, Convert, Copy, Create, Cross, Cumulative, Current, Database, DataPageSize, Datestyle, Date, Day, Days, Decimal, Declare, Dedup, Default, DefaultTransactionReadOnly, Deferred, Delay, Delete, Delimiter, Desc, Detach, Details, Disable, Distinct, Double, Drop, Else, Enable, End, Error, Every, Except, Exclude, Exclusive, Exists, Exit, Explain, External, False, Fill, First, Float, Following, For, Foreign, Format, From, Full, Geohash, Grant, Group, Groups, Header, Horizon, Hour, Hours, Http, If, Ignore, Ilike, Immediate, In, Include, Index, Inner, Insert, Incremental, Int, Integer, Intersect, Interval, Into, Ipv4, Is, Isolation, Jwk, Join, Keep, Key, Keys, Latest, Left, Length, Level, Like, Limit, Linear, List, Lock, Long, Long128, Long256, Lt, Manual, Maps, Materialized, MaxIdentifierLength, MaxUncommittedRows, Microsecond, Microseconds, Millennium, Millisecond, Milliseconds, Minute, Minutes, Month, Months, NaN, Nanosecond, Nanoseconds, No, Nocache, None, Not, Null, Nulls, O3MaxLag, Observation, Offset, On, Only, Option, Or, Order, Others, Outer, Over, Overridable, Owned, Param, Parameters, Parquet, ParquetVersion, PartitionBy, Partition, Partitions, Password, Period, Permissions, Pivot, Prepare, Preceding, Prev, Prevailing, Primary, Public, Query, Range, References, Refresh, Release, Reindex, Remove, Rename, Repair, Replace, Rest, Respect, Resume, Revoke, Right, Row, RowGroupSize, Rows, Sample, SearchPath, Second, Seconds, Select, ServerVersion, ServerVersionNum, Service, Set, Short, Show, Skip, SkipColumn, SkipRow, Snapshot, Splice, Squash, StandardConformingStrings, Step, Start, StatisticsEnabled, String, Suspend, Symbol, System, Table, Tables, Then, Time, Timestamp, TimestampNs, To, Token, Tolerance, Transaction, TransactionIsolation, Transient, True, Truncate, Ttl, Txn, Type, Unbounded, Union, Unlock, Unpivot, Update, Upsert, User, Users, Uuid, Vacuum, Values, Varchar, Verification, View, Volume, Wal, Week, Weeks, When, Where, Window, With, Within, Writer, Year, Years, Zone, RawArrayEncoding, Uncompressed, Snappy, Gzip, Lz4, Zstd, Lz4Raw, Brotli, Lzo } from "./tokens";
 export { IdentifierKeyword };
-export { Abort, Account, Accounts, Add, Alias, Align, All, Alter, And, Any, As, Asc, Asof, Assume, Attach, Atomic, Backup, Base, Batch, Between, Binary, Boolean, By, Bypass, Byte, Cache, Calendar, Cancel, Capacity, Cascade, Case, Cast, Char, Checkpoint, Column, Columns, Compile, Complete, CompressionCodec, CompressionLevel, CommitLag, Convert, Copy, Create, Cross, Cumulative, Current, Database, DataPageSize, Datestyle, Date, Day, Days, Decimal, Declare, Dedup, Default, DefaultTransactionReadOnly, Deferred, Delay, Delete, Delimiter, Desc, Detach, Details, Disable, Distinct, Double, Drop, Else, Enable, End, Error, Every, Except, Exclude, Exclusive, Exists, Exit, Explain, External, False, Fill, First, Float, Following, For, Foreign, Format, From, Full, Geohash, Grant, Group, Groups, Header, Hour, Hours, Http, If, Ignore, Ilike, Immediate, In, Include, Index, Inner, Insert, Incremental, Int, Integer, Intersect, Interval, Into, Ipv4, Is, Isolation, Jwk, Join, Keep, Key, Keys, Latest, Left, Length, Level, Like, Limit, Linear, List, Lock, Long, Long128, Long256, Lt, Manual, Maps, Materialized, MaxIdentifierLength, MaxUncommittedRows, Microsecond, Microseconds, Millennium, Millisecond, Milliseconds, Minute, Minutes, Month, Months, NaN, Nanosecond, Nanoseconds, No, Nocache, None, Not, Null, Nulls, O3MaxLag, Observation, Offset, On, Only, Option, Or, Order, Others, Outer, Over, Overridable, Owned, Param, Parameters, Parquet, ParquetVersion, PartitionBy, Partition, Partitions, Password, Period, Permissions, Pivot, Prepare, Preceding, Prev, Prevailing, Primary, Public, Query, Range, References, Refresh, Release, Reindex, Remove, Rename, Repair, Replace, Rest, Respect, Resume, Revoke, Right, Row, RowGroupSize, Rows, Sample, SearchPath, Second, Seconds, Select, ServerVersion, ServerVersionNum, Service, Set, Short, Show, Skip, SkipColumn, SkipRow, Snapshot, Splice, Squash, StandardConformingStrings, Start, StatisticsEnabled, String, Suspend, Symbol, System, Table, Tables, Then, Time, Timestamp, TimestampNs, To, Token, Tolerance, Transaction, TransactionIsolation, Transient, True, Truncate, Ttl, Txn, Type, Unbounded, Union, Unlock, Unpivot, Update, Upsert, User, Users, Uuid, Vacuum, Values, Varchar, Verification, View, Volume, Wal, Week, Weeks, When, Where, Window, With, Within, Writer, Year, Years, Zone, RawArrayEncoding, Uncompressed, Snappy, Gzip, Lz4, Zstd, Lz4Raw, Brotli, Lzo, };
+export { Abort, Account, Accounts, Add, Alias, Align, All, Alter, And, Any, As, Asc, Asof, Assume, Attach, Atomic, Backup, Base, Batch, Between, Binary, Boolean, By, Bypass, Byte, Cache, Calendar, Cancel, Capacity, Cascade, Case, Cast, Char, Checkpoint, Column, Columns, Compile, Complete, CompressionCodec, CompressionLevel, CommitLag, Convert, Copy, Create, Cross, Cumulative, Current, Database, DataPageSize, Datestyle, Date, Day, Days, Decimal, Declare, Dedup, Default, DefaultTransactionReadOnly, Deferred, Delay, Delete, Delimiter, Desc, Detach, Details, Disable, Distinct, Double, Drop, Else, Enable, End, Error, Every, Except, Exclude, Exclusive, Exists, Exit, Explain, External, False, Fill, First, Float, Following, For, Foreign, Format, From, Full, Geohash, Grant, Group, Groups, Header, Horizon, Hour, Hours, Http, If, Ignore, Ilike, Immediate, In, Include, Index, Inner, Insert, Incremental, Int, Integer, Intersect, Interval, Into, Ipv4, Is, Isolation, Jwk, Join, Keep, Key, Keys, Latest, Left, Length, Level, Like, Limit, Linear, List, Lock, Long, Long128, Long256, Lt, Manual, Maps, Materialized, MaxIdentifierLength, MaxUncommittedRows, Microsecond, Microseconds, Millennium, Millisecond, Milliseconds, Minute, Minutes, Month, Months, NaN, Nanosecond, Nanoseconds, No, Nocache, None, Not, Null, Nulls, O3MaxLag, Observation, Offset, On, Only, Option, Or, Order, Others, Outer, Over, Overridable, Owned, Param, Parameters, Parquet, ParquetVersion, PartitionBy, Partition, Partitions, Password, Period, Permissions, Pivot, Prepare, Preceding, Prev, Prevailing, Primary, Public, Query, Range, References, Refresh, Release, Reindex, Remove, Rename, Repair, Replace, Rest, Respect, Resume, Revoke, Right, Row, RowGroupSize, Rows, Sample, SearchPath, Second, Seconds, Select, ServerVersion, ServerVersionNum, Service, Set, Short, Show, Skip, SkipColumn, SkipRow, Snapshot, Splice, Squash, StandardConformingStrings, Step, Start, StatisticsEnabled, String, Suspend, Symbol, System, Table, Tables, Then, Time, Timestamp, TimestampNs, To, Token, Tolerance, Transaction, TransactionIsolation, Transient, True, Truncate, Ttl, Txn, Type, Unbounded, Union, Unlock, Unpivot, Update, Upsert, User, Users, Uuid, Vacuum, Values, Varchar, Verification, View, Volume, Wal, Week, Weeks, When, Where, Window, With, Within, Writer, Year, Years, Zone, RawArrayEncoding, Uncompressed, Snappy, Gzip, Lz4, Zstd, Lz4Raw, Brotli, Lzo, };
 export declare const Star: TokenType;
 export declare const Comma: TokenType;
 export declare const Semicolon: TokenType;

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;
@@ -30,6 +31,8 @@ declare class QuestDBParser extends CstParser {
     private asofLtJoin;
     private spliceJoin;
     private windowJoin;
+    private horizonJoin;
+    private horizonOffset;
     private standardJoin;
     private windowJoinBound;
     private durationExpression;

package/dist/parser/tokens.d.ts

@@ -100,6 +100,7 @@ export declare const Grant: TokenType;
 export declare const Group: TokenType;
 export declare const Groups: TokenType;
 export declare const Header: TokenType;
+export declare const Horizon: TokenType;
 export declare const Http: TokenType;
 export declare const If: TokenType;
 export declare const Ignore: TokenType;
@@ -200,6 +201,7 @@ export declare const Snapshot: TokenType;
 export declare const Splice: TokenType;
 export declare const Squash: TokenType;
 export declare const StandardConformingStrings: TokenType;
+export declare const Step: TokenType;
 export declare const Start: TokenType;
 export declare const StatisticsEnabled: TokenType;
 export declare const Suspend: TokenType;

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, 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;
@@ -25,6 +26,8 @@ declare class QuestDBVisitor extends BaseVisitor {
     asofLtJoin(ctx: AsofLtJoinCstChildren): AST.JoinClause;
     spliceJoin(ctx: SpliceJoinCstChildren): AST.JoinClause;
     windowJoin(ctx: WindowJoinCstChildren): AST.JoinClause;
+    horizonJoin(ctx: HorizonJoinCstChildren): AST.JoinClause;
+    horizonOffset(ctx: HorizonOffsetCstChildren): string;
     standardJoin(ctx: StandardJoinCstChildren): AST.JoinClause;
     windowJoinBound(ctx: WindowJoinBoundCstChildren): AST.WindowJoinBound;
     durationExpression(ctx: DurationExpressionCstChildren): string;

package/package.json

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