parser gaps, operator precedence, ttl fixes, missing keywords

Author: emrberk

src/grammar/constants.ts

@@ -3,9 +3,11 @@ export const constants: string[] = [
   "brotli",
   "century",
   "complete",
+  "datestyle",
   "day",
   "days",
   "decade",
+  "default_transaction_read_only",
   "desc",
   "dow",
   "doy",
@@ -26,6 +28,7 @@ export const constants: string[] = [
   "lz4_raw",
   "lzo",
   "manual",
+  "max_identifier_length",
   "microsecond",
   "microseconds",
   "millennium",
@@ -47,11 +50,16 @@ export const constants: string[] = [
   "prev",
   "quarter",
   "rest",
+  "search_path",
   "second",
   "seconds",
+  "server_version",
+  "server_version_num",
   "skip_column",
   "skip_row",
   "snappy",
+  "standard_conforming_strings",
+  "transaction_isolation",
   "true",
   "uncompressed",
   "week",

src/grammar/keywords.ts

@@ -93,6 +93,7 @@ export const keywords: string[] = [
   "is",
   "isolation",
   "join",
+  "keep",
   "key",
   "keys",
   "latest",
@@ -104,6 +105,7 @@ export const keywords: string[] = [
   "list",
   "lock",
   "lt",
+  "maps",
   "materialized",
   "maxUncommittedRows",
   "no",
@@ -155,7 +157,6 @@ export const keywords: string[] = [
   "row_group_size",
   "rows",
   "sample",
-  "server_version",
   "select",
   "service",
   "set",

src/index.ts

@@ -87,16 +87,17 @@ export function parseToAst(sql: string): ParseResult {
   }
 
   let ast: Statement[] = []
-  if (errors.length > 0) {
-    try {
-      ast = visitor.visit(cst) as Statement[]
-    } catch {
-      // The visitor may throw on incomplete CST nodes produced by error recovery
-      // (e.g. "Unknown primary expression", null dereferences on missing children).
-      // Since we already have parse errors, return them with whatever AST was built.
-    }
-  } else {
+  try {
     ast = visitor.visit(cst) as Statement[]
+  } catch (e) {
+    if (errors.length === 0) {
+      // Semantic error from the visitor (e.g. invalid TTL duration unit).
+      errors.push({
+        message: e instanceof Error ? e.message : String(e),
+      })
+    }
+    // When there are already lex/parse errors, the visitor may throw on
+    // incomplete CST nodes produced by error recovery — that is expected.
   }
 
   return { ast, errors }

src/parser/ast.ts

@@ -349,6 +349,9 @@ export interface AlterUserCreateTokenAction {
   tokenType: "JWK" | "REST"
   ttl?: string
   refresh?: boolean
+  transient?: boolean
+  publicKeyX?: string
+  publicKeyY?: string
 }
 
 export interface AlterUserDropTokenAction {
@@ -535,8 +538,10 @@ export interface DropServiceAccountStatement extends AstNode {
 
 export interface TruncateTableStatement extends AstNode {
   type: "truncateTable"
-  table: QualifiedName
+  tables: QualifiedName[]
   ifExists?: boolean
+  only?: boolean
+  keepSymbolMaps?: boolean
 }
 
 export interface RenameTableStatement extends AstNode {
@@ -589,6 +594,14 @@ export interface ShowStatement extends AstNode {
     | "permissions"
     | "serverVersion"
     | "parameters"
+    | "transactionIsolationLevel"
+    | "maxIdentifierLength"
+    | "standardConformingStrings"
+    | "searchPath"
+    | "dateStyle"
+    | "timeZone"
+    | "serverVersionNum"
+    | "defaultTransactionReadOnly"
   table?: QualifiedName
   name?: QualifiedName
 }
@@ -942,6 +955,8 @@ export interface FunctionCall extends AstNode {
   fromSeparator?: boolean
   /** IGNORE NULLS modifier (e.g., first_value(x) IGNORE NULLS) */
   ignoreNulls?: boolean
+  /** RESPECT NULLS modifier (e.g., first_value(x) RESPECT NULLS) */
+  respectNulls?: boolean
   /** Subquery as function argument (e.g., touch(SELECT * FROM t)) */
   subquery?: SelectStatement
   over?: WindowSpecification

src/parser/cst-types.d.ts

@@ -994,12 +994,15 @@ export type AlterUserActionCstChildren = {
   Token?: (IToken)[];
   Type?: (IToken)[];
   Jwk?: (IToken)[];
+  Public?: IToken[];
+  Key?: IToken[];
+  Identifier?: (IToken)[];
   Rest?: (IToken)[];
   Ttl?: IToken[];
   DurationLiteral?: IToken[];
   Refresh?: IToken[];
+  Transient?: IToken[];
   Drop?: IToken[];
-  Identifier?: IToken[];
 };
 
 export interface AlterTableStatementCstNode extends CstNode {
@@ -1234,7 +1237,12 @@ export type TruncateTableStatementCstChildren = {
   Table: IToken[];
   If?: IToken[];
   Exists?: IToken[];
-  qualifiedName: QualifiedNameCstNode[];
+  Only?: IToken[];
+  qualifiedName: (QualifiedNameCstNode)[];
+  Comma?: IToken[];
+  Keep?: IToken[];
+  Symbol?: IToken[];
+  Maps?: IToken[];
 };
 
 export interface RenameTableStatementCstNode extends CstNode {
@@ -1336,6 +1344,18 @@ export type ShowStatementCstChildren = {
   Accounts?: IToken[];
   Permissions?: IToken[];
   ServerVersion?: IToken[];
+  Transaction?: IToken[];
+  Isolation?: IToken[];
+  Level?: IToken[];
+  TransactionIsolation?: IToken[];
+  MaxIdentifierLength?: IToken[];
+  StandardConformingStrings?: IToken[];
+  SearchPath?: IToken[];
+  Datestyle?: IToken[];
+  Time?: IToken[];
+  Zone?: IToken[];
+  ServerVersionNum?: IToken[];
+  DefaultTransactionReadOnly?: IToken[];
   Parameters?: IToken[];
 };
 
@@ -1839,11 +1859,15 @@ export type SetExpressionCstChildren = {
   expression?: (ExpressionCstNode)[];
   Comma?: (IToken)[];
   RParen?: (IToken)[];
+  inValue?: BitOrExpressionCstNode[];
   Between?: IToken[];
   betweenLow?: BitOrExpressionCstNode[];
   And?: IToken[];
   betweenHigh?: BitOrExpressionCstNode[];
   Within?: IToken[];
+  Like?: IToken[];
+  Ilike?: IToken[];
+  notLikeRight?: BitOrExpressionCstNode[];
 };
 
 export interface BitOrExpressionCstNode extends CstNode {
@@ -2103,6 +2127,7 @@ export type FunctionCallCstChildren = {
   From?: IToken[];
   RParen: IToken[];
   Ignore?: IToken[];
+  Respect?: IToken[];
   Nulls?: IToken[];
   overClause?: OverClauseCstNode[];
 };
@@ -2123,6 +2148,7 @@ export type IdentifierExpressionCstChildren = {
   From?: IToken[];
   RParen?: IToken[];
   Ignore?: IToken[];
+  Respect?: IToken[];
   Nulls?: IToken[];
   overClause?: OverClauseCstNode[];
 };

src/parser/lexer.ts

@@ -54,13 +54,15 @@ import {
   Current,
   Database,
   DataPageSize,
+  Datestyle,
   Date,
   Day,
   Days,
   Decimal,
   Declare,
   Dedup,
   Default,
+  DefaultTransactionReadOnly,
   Deferred,
   Delay,
   Delete,
@@ -122,6 +124,7 @@ import {
   Isolation,
   Jwk,
   Join,
+  Keep,
   Key,
   Keys,
   Latest,
@@ -138,7 +141,9 @@ import {
   Long256,
   Lt,
   Manual,
+  Maps,
   Materialized,
+  MaxIdentifierLength,
   MaxUncommittedRows,
   Microsecond,
   Microseconds,
@@ -207,10 +212,12 @@ import {
   RowGroupSize,
   Rows,
   Sample,
+  SearchPath,
   Second,
   Seconds,
   Select,
   ServerVersion,
+  ServerVersionNum,
   Service,
   Set,
   Short,
@@ -221,6 +228,7 @@ import {
   Snapshot,
   Splice,
   Squash,
+  StandardConformingStrings,
   Start,
   StatisticsEnabled,
   String,
@@ -237,6 +245,7 @@ import {
   Token,
   Tolerance,
   Transaction,
+  TransactionIsolation,
   Transient,
   True,
   Truncate,
@@ -333,13 +342,15 @@ export {
   Current,
   Database,
   DataPageSize,
+  Datestyle,
   Date,
   Day,
   Days,
   Decimal,
   Declare,
   Dedup,
   Default,
+  DefaultTransactionReadOnly,
   Deferred,
   Delay,
   Delete,
@@ -401,6 +412,7 @@ export {
   Isolation,
   Jwk,
   Join,
+  Keep,
   Key,
   Keys,
   Latest,
@@ -417,7 +429,9 @@ export {
   Long256,
   Lt,
   Manual,
+  Maps,
   Materialized,
+  MaxIdentifierLength,
   MaxUncommittedRows,
   Microsecond,
   Microseconds,
@@ -486,10 +500,12 @@ export {
   RowGroupSize,
   Rows,
   Sample,
+  SearchPath,
   Second,
   Seconds,
   Select,
   ServerVersion,
+  ServerVersionNum,
   Service,
   Set,
   Short,
@@ -500,6 +516,7 @@ export {
   Snapshot,
   Splice,
   Squash,
+  StandardConformingStrings,
   Start,
   StatisticsEnabled,
   String,
@@ -516,6 +533,7 @@ export {
   Token,
   Tolerance,
   Transaction,
+  TransactionIsolation,
   Transient,
   True,
   Truncate,