rawsql-ts 0.12.0 → 0.13.0

package/dist/src/parsers/SqlPrintTokenParser.d.ts

@@ -190,6 +190,9 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     private visitValueList;
     private visitColumnReference;
     private visitFunctionCall;
+    private relocateGroupingSetComments;
+    private isGroupingSetsFunction;
+    private extractPositionedComments;
     private visitUnaryExpression;
     private visitBinaryExpression;
     private visitLiteralValue;
@@ -292,13 +295,19 @@ export declare class SqlPrintTokenParser implements SqlComponentVisitor<SqlPrint
     private wrapWithParenExpression;
     private visitReferenceDefinition;
     private visitCreateIndexStatement;
+    private visitCreateSequenceStatement;
+    private visitAlterSequenceStatement;
+    private visitSequenceClauses;
+    private visitSequenceClause;
     private visitIndexColumnDefinition;
     private visitDropTableStatement;
     private visitDropIndexStatement;
     private visitAlterTableStatement;
     private visitAlterTableAddConstraint;
     private visitAlterTableDropConstraint;
+    private visitAlterTableAddColumn;
     private visitAlterTableDropColumn;
+    private visitAlterTableAlterColumnDefault;
     private visitDropConstraintStatement;
     private visitExplainStatement;
     private visitAnalyzeStatement;

package/dist/src/parsers/SqlPrintTokenParser.js

@@ -5,6 +5,7 @@ const Clause_1 = require("../models/Clause");
 const HintClause_1 = require("../models/HintClause");
 const SelectQuery_1 = require("../models/SelectQuery");
 const SqlPrintToken_1 = require("../models/SqlPrintToken");
+const SelectQueryWithClauseHelper_1 = require("../utils/SelectQueryWithClauseHelper");
 const ValueComponent_1 = require("../models/ValueComponent");
 const ParameterCollector_1 = require("../transformers/ParameterCollector");
 const IdentifierDecorator_1 = require("./IdentifierDecorator");
@@ -265,6 +266,7 @@ class SqlPrintTokenParser {
         this.handlers.set(DDLStatements_1.AlterTableStatement.kind, (expr) => this.visitAlterTableStatement(expr));
         this.handlers.set(DDLStatements_1.AlterTableAddConstraint.kind, (expr) => this.visitAlterTableAddConstraint(expr));
         this.handlers.set(DDLStatements_1.AlterTableDropConstraint.kind, (expr) => this.visitAlterTableDropConstraint(expr));
+        this.handlers.set(DDLStatements_1.AlterTableAddColumn.kind, (expr) => this.visitAlterTableAddColumn(expr));
         this.handlers.set(DDLStatements_1.AlterTableDropColumn.kind, (expr) => this.visitAlterTableDropColumn(expr));
         this.handlers.set(DDLStatements_1.DropConstraintStatement.kind, (expr) => this.visitDropConstraintStatement(expr));
         this.handlers.set(DDLStatements_1.ExplainStatement.kind, (expr) => this.visitExplainStatement(expr));
@@ -2190,8 +2192,10 @@ class SqlPrintTokenParser {
     }
     visitInsertQuery(arg) {
         const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.InsertQuery);
-        if (arg.withClause) {
-            token.innerTokens.push(arg.withClause.accept(this));
+        const selectQuery = arg.selectQuery;
+        const extractedWithClause = selectQuery ? SelectQueryWithClauseHelper_1.SelectQueryWithClauseHelper.detachWithClause(selectQuery) : null;
+        if (extractedWithClause) {
+            token.innerTokens.push(extractedWithClause.accept(this));
         }
         token.innerTokens.push(this.visit(arg.insertClause));
         // Process the select query if present
@@ -2203,6 +2207,9 @@ class SqlPrintTokenParser {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             token.innerTokens.push(arg.returningClause.accept(this));
         }
+        if (selectQuery && extractedWithClause) {
+            SelectQueryWithClauseHelper_1.SelectQueryWithClauseHelper.setWithClause(selectQuery, extractedWithClause);
+        }
         return token;
     }
     visitInsertClause(arg) {
@@ -2443,11 +2450,11 @@ class SqlPrintTokenParser {
     visitReturningClause(arg) {
         const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'returning', SqlPrintToken_1.SqlPrintTokenContainerType.ReturningClause);
         token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
-        for (let i = 0; i < arg.columns.length; i++) {
+        for (let i = 0; i < arg.items.length; i++) {
             if (i > 0) {
                 token.innerTokens.push(...SqlPrintTokenParser.commaSpaceTokens());
             }
-            token.innerTokens.push(this.visit(arg.columns[i]));
+            token.innerTokens.push(this.visit(arg.items[i]));
         }
         return token;
     }
@@ -2900,6 +2907,17 @@ class SqlPrintTokenParser {
         }
         return token;
     }
+    visitAlterTableAddColumn(arg) {
+        let keyword = 'add column';
+        if (arg.ifNotExists) {
+            keyword += ' if not exists';
+        }
+        const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.AlterTableAddColumn);
+        token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, keyword));
+        token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+        token.innerTokens.push(arg.column.accept(this));
+        return token;
+    }
     visitAlterTableDropColumn(arg) {
         let keyword = 'drop column';
         if (arg.ifExists) {