rawsql-ts 0.16.0 → 0.17.0

package/dist/parsers/FullNameParser.js

@@ -4,6 +4,26 @@ exports.FullNameParser = void 0;
 const Lexeme_1 = require("../models/Lexeme");
 const ValueComponent_1 = require("../models/ValueComponent");
 const SqlTokenizer_1 = require("./SqlTokenizer");
+/**
+ * PostgreSQL non-reserved keywords that may appear as Command tokens,
+ * but should still be accepted when parsing identifier positions.
+ * This set is intentionally limited to identifier contexts in FullNameParser.
+ */
+const POSTGRESQL_COMMAND_KEYWORDS_ALLOWED_AS_IDENTIFIER = new Set([
+    'groups', // window frame type: GROUPS BETWEEN ...
+    'rows', // window frame type: ROWS BETWEEN ...
+    'range', // window frame type: RANGE BETWEEN ...
+    'window', // window clause: WINDOW w AS (...)
+    'over', // window function: func() OVER (...)
+    'following', // window frame bound: n FOLLOWING
+    'preceding', // window frame bound: n PRECEDING
+    'within', // ordered-set aggregate: WITHIN GROUP (...)
+    'ordinality', // table function: WITH ORDINALITY
+    'lateral', // lateral join/subquery
+    'recursive', // CTE: WITH RECURSIVE
+    'materialized', // CTE: AS MATERIALIZED / AS NOT MATERIALIZED
+    'partition', // partitioning / window PARTITION BY
+]);
 /**
  * Utility class for parsing fully qualified names (e.g. db.schema.table or db.schema.table.column_name)
  * This can be used for both table and column references.
@@ -21,10 +41,15 @@ class FullNameParser {
         if (newIndex > index) {
             const lastLexeme = lexemes[newIndex - 1];
             if (lastLexeme.positionedComments && lastLexeme.positionedComments.length > 0) {
-                identifierString.positionedComments = lastLexeme.positionedComments;
+                identifierString.positionedComments = [...lastLexeme.positionedComments];
             }
-            else if (lastLexeme.comments && lastLexeme.comments.length > 0) {
-                identifierString;
+            // Preserve legacy comments when positioned comments are absent.
+            // This keeps backward-compatible comment transfer behavior for callers
+            // that still read from the `comments` field.
+            if ((!identifierString.positionedComments || identifierString.positionedComments.length === 0) &&
+                lastLexeme.comments &&
+                lastLexeme.comments.length > 0) {
+                identifierString.comments = [...lastLexeme.comments];
             }
         }
         // Returns the type of the last token in the identifier sequence
@@ -77,6 +102,13 @@ class FullNameParser {
                 identifiers.push(lexemes[idx].value);
                 idx++;
             }
+            else if ((lexemes[idx].type & Lexeme_1.TokenType.Command) &&
+                POSTGRESQL_COMMAND_KEYWORDS_ALLOWED_AS_IDENTIFIER.has(lexemes[idx].value.toLowerCase())) {
+                // Accept selected PostgreSQL non-reserved keywords only when this parser
+                // is reading an identifier position (e.g. schema.table or table.column).
+                identifiers.push(lexemes[idx].value);
+                idx++;
+            }
             else if (lexemes[idx].value === "*") {
                 // The wildcard '*' is always treated as the terminal part of a qualified name in SQL (e.g., db.schema.* or [db].[schema].*).
                 // No valid SQL syntax allows a wildcard in the middle of a multi-part name.

package/dist/parsers/FullNameParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"FullNameParser.js","sourceRoot":"","sources":["../../src/parsers/FullNameParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FullNameParser.js","sourceRoot":"","sources":["../../src/parsers/FullNameParser.ts"],"names":[],"mappings":"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"}

package/dist/parsers/SqlParser.js

@@ -23,6 +23,7 @@ const VacuumStatementParser_1 = require("./VacuumStatementParser");
 const ReindexStatementParser_1 = require("./ReindexStatementParser");
 const ClusterStatementParser_1 = require("./ClusterStatementParser");
 const CheckpointStatementParser_1 = require("./CheckpointStatementParser");
+const CommentOnParser_1 = require("./CommentOnParser");
 /**
  * Canonical entry point for SQL parsing.
  * Delegates to dedicated parsers for SELECT, INSERT, UPDATE, and DELETE statements, and is designed to embrace additional statement types next.
@@ -33,6 +34,19 @@ class SqlParser {
         const skipEmpty = (_a = options.skipEmptyStatements) !== null && _a !== void 0 ? _a : true;
         const mode = (_b = options.mode) !== null && _b !== void 0 ? _b : 'single';
         const tokenizer = new SqlTokenizer_1.SqlTokenizer(sql);
+        // Fast path for the common single-statement parse used by benchmarks and most callers.
+        if (mode === 'single' && skipEmpty) {
+            const first = this.readNextMeaningfulStatement(tokenizer, 0);
+            if (!first) {
+                throw new Error('[SqlParser] No SQL statements found in input.');
+            }
+            const parsed = this.dispatchParse(first, 1);
+            const remainder = this.readNextMeaningfulStatement(tokenizer, first.nextPosition);
+            if (remainder) {
+                throw new Error('[SqlParser] Unexpected additional statement detected at index 2. Use parseMany or set mode to "multiple" to allow multiple statements.');
+            }
+            return parsed;
+        }
         // Acquire the first meaningful statement so future dispatching can inspect its leading keyword.
         const first = this.consumeNextStatement(tokenizer, 0, skipEmpty);
         if (!first) {
@@ -110,6 +124,7 @@ class SqlParser {
                 return this.parseDeleteStatement(segment, statementIndex);
             case 'create table':
             case 'create temporary table':
+            case 'create unlogged table':
                 return this.parseCreateTableStatement(segment, statementIndex);
             case 'merge into':
                 return this.parseMergeStatement(segment, statementIndex);
@@ -134,6 +149,9 @@ class SqlParser {
                 return this.parseAlterSequenceStatement(segment, statementIndex);
             case 'drop constraint':
                 return this.parseDropConstraintStatement(segment, statementIndex);
+            case 'comment on table':
+            case 'comment on column':
+                return this.parseCommentOnStatement(segment, statementIndex);
             case 'analyze':
                 return this.parseAnalyzeStatement(segment, statementIndex);
             case 'explain':
@@ -155,360 +173,110 @@ class SqlParser {
         }
     }
     static parseSelectStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = SelectQueryParser_1.SelectQueryParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse SELECT statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'SELECT', (lexemes, startIndex) => SelectQueryParser_1.SelectQueryParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseExplainStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = ExplainStatementParser_1.ExplainStatementParser.parseFromLexeme(segment.lexemes, 0, (lexemes, nestedStart) => {
-                if (nestedStart >= lexemes.length) {
-                    throw new Error("[ExplainStatementParser] Missing statement after EXPLAIN options.");
-                }
-                const nestedSegment = {
-                    lexemes: lexemes.slice(nestedStart),
-                    statementStart: segment.statementStart,
-                    statementEnd: segment.statementEnd,
-                    nextPosition: segment.nextPosition,
-                    rawText: segment.rawText,
-                    leadingComments: segment.leadingComments,
-                };
-                const statement = this.dispatchParse(nestedSegment, statementIndex);
-                return { value: statement, newIndex: lexemes.length };
-            });
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in EXPLAIN statement ${statementIndex} at character ${position}.`);
+        return this.parseStatementWithCallback(segment, statementIndex, 'EXPLAIN', () => ExplainStatementParser_1.ExplainStatementParser.parseFromLexeme(segment.lexemes, 0, (lexemes, nestedStart) => {
+            if (nestedStart >= lexemes.length) {
+                throw new Error("[ExplainStatementParser] Missing statement after EXPLAIN options.");
             }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse EXPLAIN statement ${statementIndex}: ${message}`);
-        }
+            const nestedSegment = {
+                lexemes: lexemes.slice(nestedStart),
+                statementStart: segment.statementStart,
+                statementEnd: segment.statementEnd,
+                nextPosition: segment.nextPosition,
+                rawText: segment.rawText,
+                leadingComments: segment.leadingComments,
+            };
+            const statement = this.dispatchParse(nestedSegment, statementIndex);
+            return { value: statement, newIndex: lexemes.length };
+        }), `EXPLAIN statement ${statementIndex}`);
     }
     static parseVacuumStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = VacuumStatementParser_1.VacuumStatementParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in VACUUM statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse VACUUM statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'VACUUM', (lexemes, startIndex) => VacuumStatementParser_1.VacuumStatementParser.parseFromLexeme(lexemes, startIndex), `VACUUM statement ${statementIndex}`);
     }
     static parseReindexStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = ReindexStatementParser_1.ReindexStatementParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in REINDEX statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse REINDEX statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'REINDEX', (lexemes, startIndex) => ReindexStatementParser_1.ReindexStatementParser.parseFromLexeme(lexemes, startIndex), `REINDEX statement ${statementIndex}`);
     }
     static parseClusterStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = ClusterStatementParser_1.ClusterStatementParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in CLUSTER statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse CLUSTER statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'CLUSTER', (lexemes, startIndex) => ClusterStatementParser_1.ClusterStatementParser.parseFromLexeme(lexemes, startIndex), `CLUSTER statement ${statementIndex}`);
     }
     static parseCheckpointStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = CheckpointStatementParser_1.CheckpointStatementParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in CHECKPOINT statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse CHECKPOINT statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'CHECKPOINT', (lexemes, startIndex) => CheckpointStatementParser_1.CheckpointStatementParser.parseFromLexeme(lexemes, startIndex), `CHECKPOINT statement ${statementIndex}`);
     }
     static parseInsertStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = InsertQueryParser_1.InsertQueryParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse INSERT statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'INSERT', (lexemes, startIndex) => InsertQueryParser_1.InsertQueryParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseUpdateStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = UpdateQueryParser_1.UpdateQueryParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse UPDATE statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'UPDATE', (lexemes, startIndex) => UpdateQueryParser_1.UpdateQueryParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseDeleteStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = DeleteQueryParser_1.DeleteQueryParser.parseFromLexeme(segment.lexemes, 0);
-            // Guard against trailing tokens that would indicate multiple statements in DELETE parsing.
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse DELETE statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'DELETE', (lexemes, startIndex) => DeleteQueryParser_1.DeleteQueryParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseCreateTableStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = CreateTableParser_1.CreateTableParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse CREATE TABLE statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'CREATE TABLE', (lexemes, startIndex) => CreateTableParser_1.CreateTableParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseDropTableStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = DropTableParser_1.DropTableParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse DROP TABLE statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'DROP TABLE', (lexemes, startIndex) => DropTableParser_1.DropTableParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseDropSchemaStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = DropSchemaParser_1.DropSchemaParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse DROP SCHEMA statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'DROP SCHEMA', (lexemes, startIndex) => DropSchemaParser_1.DropSchemaParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseDropIndexStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = DropIndexParser_1.DropIndexParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse DROP INDEX statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'DROP INDEX', (lexemes, startIndex) => DropIndexParser_1.DropIndexParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseCreateIndexStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = CreateIndexParser_1.CreateIndexParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse CREATE INDEX statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'CREATE INDEX', (lexemes, startIndex) => CreateIndexParser_1.CreateIndexParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseCreateSchemaStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = CreateSchemaParser_1.CreateSchemaParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse CREATE SCHEMA statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'CREATE SCHEMA', (lexemes, startIndex) => CreateSchemaParser_1.CreateSchemaParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseCreateSequenceStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = SequenceParser_1.CreateSequenceParser.parseFromLexeme(segment.lexemes, 0);
-            // Ensure no trailing lexemes remain after the CREATE SEQUENCE clause.
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse CREATE SEQUENCE statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'CREATE SEQUENCE', (lexemes, startIndex) => SequenceParser_1.CreateSequenceParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseAlterSequenceStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = SequenceParser_1.AlterSequenceParser.parseFromLexeme(segment.lexemes, 0);
-            // Validate that the ALTER SEQUENCE statement consumed all available tokens.
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse ALTER SEQUENCE statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'ALTER SEQUENCE', (lexemes, startIndex) => SequenceParser_1.AlterSequenceParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseAlterTableStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = AlterTableParser_1.AlterTableParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse ALTER TABLE statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'ALTER TABLE', (lexemes, startIndex) => AlterTableParser_1.AlterTableParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseDropConstraintStatement(segment, statementIndex) {
-        var _a, _b;
-        try {
-            const result = DropConstraintParser_1.DropConstraintParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse DROP CONSTRAINT statement ${statementIndex}: ${message}`);
-        }
+        return this.parseStatementWithParser(segment, statementIndex, 'DROP CONSTRAINT', (lexemes, startIndex) => DropConstraintParser_1.DropConstraintParser.parseFromLexeme(lexemes, startIndex));
+    }
+    static parseCommentOnStatement(segment, statementIndex) {
+        return this.parseStatementWithParser(segment, statementIndex, 'COMMENT ON', (lexemes, startIndex) => CommentOnParser_1.CommentOnParser.parseFromLexeme(lexemes, startIndex));
     }
     static parseAnalyzeStatement(segment, statementIndex) {
-        var _a, _b;
+        return this.parseStatementWithParser(segment, statementIndex, 'ANALYZE', (lexemes, startIndex) => AnalyzeStatementParser_1.AnalyzeStatementParser.parseFromLexeme(lexemes, startIndex));
+    }
+    static parseMergeStatement(segment, statementIndex) {
+        return this.parseStatementWithParser(segment, statementIndex, 'MERGE', (lexemes, startIndex) => MergeQueryParser_1.MergeQueryParser.parseFromLexeme(lexemes, startIndex));
+    }
+    static parseStatementWithParser(segment, statementIndex, statementLabel, parser, trailingContext = `statement ${statementIndex}`) {
+        return this.parseStatementWithCallback(segment, statementIndex, statementLabel, () => parser(segment.lexemes, 0), trailingContext);
+    }
+    static parseStatementWithCallback(segment, statementIndex, statementLabel, parse, trailingContext = `statement ${statementIndex}`) {
         try {
-            // Delegate lexeme interpretation to the ANALYZE-specific parser.
-            const result = AnalyzeStatementParser_1.AnalyzeStatementParser.parseFromLexeme(segment.lexemes, 0);
-            // Ensure parsing consumed every lexeme belonging to this statement.
-            if (result.newIndex < segment.lexemes.length) {
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
+            const result = parse();
+            // Keep trailing-token validation centralized so every statement parser reports the same shape of error.
+            this.assertFullyConsumed(segment, result.newIndex, trailingContext);
             return result.value;
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse ANALYZE statement ${statementIndex}: ${message}`);
+            throw new Error(`[SqlParser] Failed to parse ${statementLabel} statement ${statementIndex}: ${this.errorMessage(error)}`);
         }
     }
-    static parseMergeStatement(segment, statementIndex) {
+    static assertFullyConsumed(segment, newIndex, trailingContext) {
         var _a, _b;
-        try {
-            const result = MergeQueryParser_1.MergeQueryParser.parseFromLexeme(segment.lexemes, 0);
-            if (result.newIndex < segment.lexemes.length) {
-                // Guard against trailing tokens that would indicate parsing stopped prematurely.
-                const unexpected = segment.lexemes[result.newIndex];
-                const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
-                throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in statement ${statementIndex} at character ${position}.`);
-            }
-            return result.value;
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`[SqlParser] Failed to parse MERGE statement ${statementIndex}: ${message}`);
+        if (newIndex >= segment.lexemes.length) {
+            return;
         }
+        const unexpected = segment.lexemes[newIndex];
+        const position = (_b = (_a = unexpected.position) === null || _a === void 0 ? void 0 : _a.startPosition) !== null && _b !== void 0 ? _b : segment.statementStart;
+        throw new Error(`[SqlParser] Unexpected token "${unexpected.value}" in ${trailingContext} at character ${position}.`);
+    }
+    static errorMessage(error) {
+        return error instanceof Error ? error.message : String(error);
     }
     static getCommandAfterWith(lexemes) {
         var _a;
@@ -521,6 +289,24 @@ class SqlParser {
             return null;
         }
     }
+    static readNextMeaningfulStatement(tokenizer, cursor) {
+        let localCursor = cursor;
+        let carry = null;
+        while (true) {
+            const segment = tokenizer.readNextStatement(localCursor, carry);
+            carry = null;
+            if (!segment) {
+                return null;
+            }
+            if (segment.lexemes.length > 0) {
+                return segment;
+            }
+            localCursor = segment.nextPosition;
+            if (segment.leadingComments && segment.leadingComments.length > 0) {
+                carry = segment.leadingComments;
+            }
+        }
+    }
     static consumeNextStatement(tokenizer, cursor, skipEmpty) {
         let localCursor = cursor;
         let carry = null;