rawsql-ts 0.23.1 → 0.24.0

package/dist/parsers/InsertQueryParser.js

@@ -15,6 +15,10 @@ const ValuesQueryParser_1 = require("./ValuesQueryParser");
 const ReturningClauseParser_1 = require("./ReturningClauseParser");
 const ValueComponent_1 = require("../models/ValueComponent");
 const LexemeCommentUtils_1 = require("./utils/LexemeCommentUtils");
+const ParserStringUtils_1 = require("../utils/ParserStringUtils");
+const ForClauseParser_1 = require("./ForClauseParser");
+const WhereClauseParser_1 = require("./WhereClauseParser");
+const SetClauseParser_1 = require("./SetClauseParser");
 class InsertQueryParser {
     /**
      * Parse SQL string to InsertQuery AST.
@@ -33,7 +37,7 @@ class InsertQueryParser {
      * Parse from lexeme array (for internal use and tests)
      */
     static parseFromLexeme(lexemes, index) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let idx = index;
         let withClause = null;
         if (((_a = lexemes[idx]) === null || _a === void 0 ? void 0 : _a.value) === "with") {
@@ -132,12 +136,21 @@ class InsertQueryParser {
             dataQuery = selectResult.value;
             idx = selectResult.newIndex;
         }
+        let onConflictClause = null;
+        if (((_g = lexemes[idx]) === null || _g === void 0 ? void 0 : _g.value) === "on conflict") {
+            const onConflictResult = this.parseOnConflictClause(lexemes, idx);
+            onConflictClause = onConflictResult.value;
+            idx = onConflictResult.newIndex;
+        }
         let returningClause = null;
-        if (((_g = lexemes[idx]) === null || _g === void 0 ? void 0 : _g.value) === "returning") {
+        if (((_h = lexemes[idx]) === null || _h === void 0 ? void 0 : _h.value) === "returning") {
             const returningResult = ReturningClauseParser_1.ReturningClauseParser.parseFromLexeme(lexemes, idx);
             returningClause = returningResult.value;
             idx = returningResult.newIndex;
         }
+        if ((onConflictClause === null || onConflictClause === void 0 ? void 0 : onConflictClause.action) === "select" && !returningClause) {
+            throw new Error(`Syntax error: ON CONFLICT DO SELECT requires a RETURNING clause.`);
+        }
         const insertClause = new Clause_1.InsertClause(targetSource, columnIdentifiers !== null && columnIdentifiers !== void 0 ? columnIdentifiers : null);
         if (insertKeywordComments.before.length > 0) {
             insertClause.addPositionedComments("before", insertKeywordComments.before);
@@ -152,11 +165,115 @@ class InsertQueryParser {
             value: new InsertQuery_1.InsertQuery({
                 insertClause,
                 selectQuery: dataQuery,
+                onConflict: onConflictClause,
                 returning: returningClause
             }),
             newIndex: idx
         };
     }
+    static parseOnConflictClause(lexemes, index) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        let idx = index;
+        if (((_a = lexemes[idx]) === null || _a === void 0 ? void 0 : _a.value) !== "on conflict") {
+            throw new Error(`Syntax error at position ${idx}: Expected 'ON CONFLICT'.`);
+        }
+        idx++;
+        let target = null;
+        let targetKind = null;
+        if (((_b = lexemes[idx]) === null || _b === void 0 ? void 0 : _b.type) === Lexeme_1.TokenType.OpenParen) {
+            const targetStart = idx;
+            idx = this.consumeBalancedParentheses(lexemes, idx);
+            target = (0, ParserStringUtils_1.joinLexemeValues)(lexemes, targetStart, idx);
+            targetKind = "columns";
+        }
+        else if (((_c = lexemes[idx]) === null || _c === void 0 ? void 0 : _c.value) === "on" && ((_d = lexemes[idx + 1]) === null || _d === void 0 ? void 0 : _d.value) === "constraint") {
+            idx += 2;
+            if (idx >= lexemes.length || lexemes[idx].value === "do select" || lexemes[idx].value === "do update" || lexemes[idx].value === "do nothing") {
+                throw new Error(`Syntax error at position ${idx}: Expected constraint name after ON CONSTRAINT.`);
+            }
+            const targetStart = idx;
+            idx++;
+            target = (0, ParserStringUtils_1.joinLexemeValues)(lexemes, targetStart, idx);
+            targetKind = "constraint";
+        }
+        const actionToken = (_e = lexemes[idx]) === null || _e === void 0 ? void 0 : _e.value;
+        if (actionToken === "do nothing") {
+            idx++;
+            return {
+                value: new Clause_1.OnConflictClause({
+                    target,
+                    targetKind,
+                    action: "nothing",
+                }),
+                newIndex: idx
+            };
+        }
+        if (actionToken === "do update") {
+            idx++;
+            const setResult = SetClauseParser_1.SetClauseParser.parseFromLexeme(lexemes, idx);
+            idx = setResult.newIndex;
+            let whereClause = null;
+            if (((_f = lexemes[idx]) === null || _f === void 0 ? void 0 : _f.value) === "where") {
+                const whereResult = WhereClauseParser_1.WhereClauseParser.parseFromLexeme(lexemes, idx);
+                whereClause = whereResult.value;
+                idx = whereResult.newIndex;
+            }
+            return {
+                value: new Clause_1.OnConflictClause({
+                    target,
+                    targetKind,
+                    action: "update",
+                    setClause: setResult.setClause,
+                    whereClause,
+                }),
+                newIndex: idx
+            };
+        }
+        if (actionToken !== "do select") {
+            const found = (_h = (_g = lexemes[idx]) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : "end of input";
+            throw new Error(`Syntax error at position ${idx}: Expected 'DO SELECT', 'DO UPDATE', or 'DO NOTHING' after ON CONFLICT but found '${found}'.`);
+        }
+        idx++;
+        let forClause = null;
+        if (((_j = lexemes[idx]) === null || _j === void 0 ? void 0 : _j.value) === "for") {
+            const forResult = ForClauseParser_1.ForClauseParser.parseFromLexeme(lexemes, idx);
+            forClause = forResult.value;
+            idx = forResult.newIndex;
+        }
+        let whereClause = null;
+        if (((_k = lexemes[idx]) === null || _k === void 0 ? void 0 : _k.value) === "where") {
+            const whereResult = WhereClauseParser_1.WhereClauseParser.parseFromLexeme(lexemes, idx);
+            whereClause = whereResult.value;
+            idx = whereResult.newIndex;
+        }
+        return {
+            value: new Clause_1.OnConflictClause({
+                target,
+                targetKind,
+                action: "select",
+                forClause,
+                whereClause,
+            }),
+            newIndex: idx
+        };
+    }
+    static consumeBalancedParentheses(lexemes, index) {
+        let idx = index;
+        let depth = 0;
+        while (idx < lexemes.length) {
+            if (lexemes[idx].type === Lexeme_1.TokenType.OpenParen) {
+                depth++;
+            }
+            else if (lexemes[idx].type === Lexeme_1.TokenType.CloseParen) {
+                depth--;
+                if (depth === 0) {
+                    return idx + 1;
+                }
+            }
+            idx++;
+        }
+        throw new Error(`Syntax error at position ${index}: Expected ')' after ON CONFLICT target.`);
+    }
 }
 exports.InsertQueryParser = InsertQueryParser;
 //# sourceMappingURL=InsertQueryParser.js.map

package/dist/parsers/InsertQueryParser.js.map

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

package/dist/parsers/ReturningClauseParser.js

@@ -6,6 +6,7 @@ const Lexeme_1 = require("../models/Lexeme");
 const Clause_1 = require("../models/Clause");
 const LexemeCommentUtils_1 = require("./utils/LexemeCommentUtils");
 const SelectClauseParser_1 = require("./SelectClauseParser");
+const FullNameParser_1 = require("./FullNameParser");
 class ReturningClauseParser {
     /**
      * Parse RETURNING clause from lexemes, starting at the given index.
@@ -20,6 +21,9 @@ class ReturningClauseParser {
         const returningLexeme = lexemes[idx];
         const returningComments = (0, LexemeCommentUtils_1.extractLexemeComments)(returningLexeme);
         idx++;
+        const aliasResult = this.parseReturningAliases(lexemes, idx);
+        const aliases = aliasResult.aliases;
+        idx = aliasResult.newIndex;
         const items = [];
         // Parse first item
         const firstItemResult = SelectClauseParser_1.SelectItemParser.parseItem(lexemes, idx);
@@ -44,7 +48,7 @@ class ReturningClauseParser {
             const position = (_e = (_d = (_c = lexemes[idx]) === null || _c === void 0 ? void 0 : _c.position) === null || _d === void 0 ? void 0 : _d.startPosition) !== null && _e !== void 0 ? _e : idx;
             throw new Error(`[ReturningClauseParser] Expected a column or '*' after RETURNING at position ${position}.`);
         }
-        const clause = new Clause_1.ReturningClause(items);
+        const clause = new Clause_1.ReturningClause(items, aliases);
         if (returningComments.before.length > 0) {
             clause.addPositionedComments("before", returningComments.before);
         }
@@ -59,6 +63,46 @@ class ReturningClauseParser {
         }
         return { value: clause, newIndex: idx };
     }
+    static parseReturningAliases(lexemes, index) {
+        var _a, _b, _c, _d;
+        let idx = index;
+        const aliases = [];
+        if (((_a = lexemes[idx]) === null || _a === void 0 ? void 0 : _a.value) !== "with") {
+            return { aliases, newIndex: idx };
+        }
+        idx++;
+        if (idx >= lexemes.length || !(lexemes[idx].type & Lexeme_1.TokenType.OpenParen)) {
+            throw new Error(`[ReturningClauseParser] Expected '(' after RETURNING WITH at position ${idx}.`);
+        }
+        idx++;
+        while (idx < lexemes.length) {
+            const kind = (_c = (_b = lexemes[idx]) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+            if (kind !== "old" && kind !== "new") {
+                throw new Error(`[ReturningClauseParser] Expected OLD or NEW in RETURNING WITH alias list at position ${idx}.`);
+            }
+            idx++;
+            if (((_d = lexemes[idx]) === null || _d === void 0 ? void 0 : _d.value) !== "as") {
+                throw new Error(`[ReturningClauseParser] Expected AS after ${kind.toUpperCase()} in RETURNING WITH alias list at position ${idx}.`);
+            }
+            idx++;
+            const aliasResult = FullNameParser_1.FullNameParser.parseFromLexeme(lexemes, idx);
+            if (aliasResult.namespaces && aliasResult.namespaces.length > 0) {
+                throw new Error(`[ReturningClauseParser] RETURNING WITH alias must be an unqualified identifier at position ${idx}.`);
+            }
+            aliases.push(new Clause_1.ReturningAlias(kind, aliasResult.name));
+            idx = aliasResult.newIndex;
+            if (idx < lexemes.length && (lexemes[idx].type & Lexeme_1.TokenType.Comma)) {
+                idx++;
+                continue;
+            }
+            if (idx < lexemes.length && (lexemes[idx].type & Lexeme_1.TokenType.CloseParen)) {
+                idx++;
+                return { aliases, newIndex: idx };
+            }
+            throw new Error(`[ReturningClauseParser] Expected ',' or ')' in RETURNING WITH alias list at position ${idx}.`);
+        }
+        throw new Error(`[ReturningClauseParser] Missing closing ')' in RETURNING WITH alias list.`);
+    }
 }
 exports.ReturningClauseParser = ReturningClauseParser;
 //# sourceMappingURL=ReturningClauseParser.js.map

package/dist/parsers/ReturningClauseParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReturningClauseParser.js","sourceRoot":"","sources":["../../src/parsers/ReturningClauseParser.ts"],"names":[],"mappings":";;;AAAA,uFAAuF;AACvF,6CAAqD;AACrD,6CAA+D;AAC/D,mEAAmE;AACnE,6DAAwD;AAExD,MAAa,qBAAqB;IAC9B;;;OAGG;IACI,MAAM,CAAC,eAAe,CAAC,OAAiB,EAAE,KAAa;;QAC1D,IAAI,GAAG,GAAG,KAAK,CAAC;QAChB,IAAI,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,0CAAE,KAAK,MAAK,WAAW,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,qCAAqC,MAAA,OAAO,CAAC,GAAG,CAAC,0CAAE,KAAK,IAAI,CAAC,CAAC;QACjH,CAAC;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,iBAAiB,GAAG,IAAA,0CAAqB,EAAC,eAAe,CAAC,CAAC;QACjE,GAAG,EAAE,CAAC;QAEN,MAAM,KAAK,GAAiB,EAAE,CAAC;QAE/B,mBAAmB;QACnB,MAAM,eAAe,GAAG,qCAAgB,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACjE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAClC,GAAG,GAAG,eAAe,CAAC,QAAQ,CAAC;QAE/B,6CAA6C;QAC7C,OAAO,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,kBAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACnE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YACjC,2EAA2E;YAC3E,sGAAsG;YACtG,sFAAsF;YACtF,8EAA8E;YAC9E,0GAA0G;YAC1G,+DAA+D;YAC/D,2EAA2E;YAE3E,GAAG,EAAE,CAAC,CAAC,aAAa;YACpB,MAAM,UAAU,GAAG,qCAAgB,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC5D,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAC7B,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC;QAC9B,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,QAAQ,GAAG,MAAA,MAAA,MAAA,OAAO,CAAC,GAAG,CAAC,0CAAE,QAAQ,0CAAE,aAAa,mCAAI,GAAG,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,gFAAgF,QAAQ,GAAG,CAAC,CAAC;QACjH,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,wBAAe,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,iBAAiB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACrE,CAAC;QACD,wHAAwH;QACxH,6FAA6F;QAC7F,kGAAkG;QAClG,0BAA0B;QAC1B,qEAAqE;QACrE,sCAAsC;QAEtC,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;IAC5C,CAAC;CACJ;AA7DD,sDA6DC"}
+{"version":3,"file":"ReturningClauseParser.js","sourceRoot":"","sources":["../../src/parsers/ReturningClauseParser.ts"],"names":[],"mappings":"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"}

package/dist/parsers/SqlPrintTokenParser.js

@@ -198,6 +198,7 @@ class SqlPrintTokenParser {
         this.handlers.set(ValueComponent_1.ArraySliceExpression.kind, (expr) => this.visitArraySliceExpression(expr));
         this.handlers.set(ValueComponent_1.ArrayIndexExpression.kind, (expr) => this.visitArrayIndexExpression(expr));
         this.handlers.set(ValueComponent_1.BetweenExpression.kind, (expr) => this.visitBetweenExpression(expr));
+        this.handlers.set(ValueComponent_1.JsonPredicateExpression.kind, (expr) => this.visitJsonPredicateExpression(expr));
         this.handlers.set(ValueComponent_1.StringSpecifierExpression.kind, (expr) => this.visitStringSpecifierExpression(expr));
         this.handlers.set(ValueComponent_1.TypeValue.kind, (expr) => this.visitTypeValue(expr));
         this.handlers.set(ValueComponent_1.TupleExpression.kind, (expr) => this.visitTupleExpression(expr));
@@ -247,6 +248,7 @@ class SqlPrintTokenParser {
         this.handlers.set(ValueComponent_1.TupleExpression.kind, (expr) => this.visitTupleExpression(expr));
         this.handlers.set(InsertQuery_1.InsertQuery.kind, (expr) => this.visitInsertQuery(expr));
         this.handlers.set(Clause_1.InsertClause.kind, (expr) => this.visitInsertClause(expr));
+        this.handlers.set(Clause_1.OnConflictClause.kind, (expr) => this.visitOnConflictClause(expr));
         this.handlers.set(UpdateQuery_1.UpdateQuery.kind, (expr) => this.visitUpdateQuery(expr));
         this.handlers.set(Clause_1.UpdateClause.kind, (expr) => this.visitUpdateClause(expr));
         this.handlers.set(DeleteQuery_1.DeleteQuery.kind, (expr) => this.visitDeleteQuery(expr));
@@ -931,6 +933,10 @@ class SqlPrintTokenParser {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'with ordinality'));
         }
+        if (arg.nullsTreatment) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, arg.nullsTreatment));
+        }
         if (arg.over) {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'over'));
@@ -2032,6 +2038,13 @@ class SqlPrintTokenParser {
     }
     visitGroupByClause(arg) {
         const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'group by', SqlPrintToken_1.SqlPrintTokenContainerType.GroupByClause);
+        if (arg.mode) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, arg.mode));
+        }
+        if (arg.grouping.length === 0) {
+            return token;
+        }
         token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
         for (let i = 0; i < arg.grouping.length; i++) {
             if (i > 0) {
@@ -2301,6 +2314,10 @@ class SqlPrintTokenParser {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             token.innerTokens.push(this.visit(arg.selectQuery));
         }
+        if (arg.onConflictClause) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(arg.onConflictClause.accept(this));
+        }
         if (arg.returningClause) {
             token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
             token.innerTokens.push(arg.returningClause.accept(this));
@@ -2310,6 +2327,59 @@ class SqlPrintTokenParser {
         }
         return token;
     }
+    visitJsonPredicateExpression(arg) {
+        const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.BinaryExpression);
+        token.innerTokens.push(this.visit(arg.expression));
+        token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+        token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.operator, arg.negated ? 'is not' : 'is'));
+        token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+        token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'json'));
+        if (arg.jsonType) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, arg.jsonType));
+        }
+        if (arg.uniqueKeys) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, `${arg.uniqueKeys} unique keys`));
+        }
+        return token;
+    }
+    visitOnConflictClause(arg) {
+        const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'on conflict', SqlPrintToken_1.SqlPrintTokenContainerType.OnConflictClause);
+        if (arg.target) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            if (arg.targetKind === "constraint") {
+                token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'on constraint'));
+                token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            }
+            token.innerTokens.push(arg.target.accept(this));
+        }
+        token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+        token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, this.formatOnConflictAction(arg)));
+        if (arg.setClause) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(arg.setClause.accept(this));
+        }
+        if (arg.forClause) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(arg.forClause.accept(this));
+        }
+        if (arg.whereClause) {
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(arg.whereClause.accept(this));
+        }
+        return token;
+    }
+    formatOnConflictAction(arg) {
+        switch (arg.action) {
+            case "nothing":
+                return "do nothing";
+            case "select":
+                return "do select";
+            case "update":
+                return "do update";
+        }
+    }
     visitInsertClause(arg) {
         const token = new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.container, '', SqlPrintToken_1.SqlPrintTokenContainerType.InsertClause);
         token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'insert into'));
@@ -2552,6 +2622,23 @@ 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);
+        if (arg.aliases.length > 0) {
+            token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'with'));
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+            token.innerTokens.push(SqlPrintTokenParser.PAREN_OPEN_TOKEN);
+            for (let i = 0; i < arg.aliases.length; i++) {
+                if (i > 0) {
+                    token.innerTokens.push(...SqlPrintTokenParser.commaSpaceTokens());
+                }
+                token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, arg.aliases[i].kind));
+                token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+                token.innerTokens.push(new SqlPrintToken_1.SqlPrintToken(SqlPrintToken_1.SqlPrintTokenType.keyword, 'as'));
+                token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+                token.innerTokens.push(this.visit(arg.aliases[i].alias));
+            }
+            token.innerTokens.push(SqlPrintTokenParser.PAREN_CLOSE_TOKEN);
+            token.innerTokens.push(SqlPrintTokenParser.SPACE_TOKEN);
+        }
         for (let i = 0; i < arg.items.length; i++) {
             if (i > 0) {
                 token.innerTokens.push(...SqlPrintTokenParser.commaSpaceTokens());