pgsql-deparser 17.18.4 → 17.18.5

package/deparser.d.ts

@@ -247,6 +247,7 @@ export declare class Deparser implements DeparserVisitor {
     CreateOpFamilyStmt(node: t.CreateOpFamilyStmt, context: DeparserContext): string;
     AlterOpFamilyStmt(node: t.AlterOpFamilyStmt, context: DeparserContext): string;
     MergeStmt(node: t.MergeStmt, context: DeparserContext): string;
+    MergeWhenClause(node: t.MergeWhenClause, context: DeparserContext): string;
     AlterTableMoveAllStmt(node: t.AlterTableMoveAllStmt, context: DeparserContext): string;
     CreateSeqStmt(node: t.CreateSeqStmt, context: DeparserContext): string;
     AlterSeqStmt(node: t.AlterSeqStmt, context: DeparserContext): string;

package/deparser.js

@@ -8056,7 +8056,17 @@ class Deparser {
             }
         }
         if (node.object) {
-            output.push(this.visit(node.object, context));
+            // Qualified names arrive as a List of String nodes and must be
+            // dot-joined (visiting the List directly would comma-join them).
+            if (typeof node.object === 'object' && 'List' in node.object) {
+                const list = node.object.List;
+                const objectParts = list_utils_1.ListUtils.unwrapList(list.items)
+                    .map(item => this.visit(item, context));
+                output.push(objectParts.join('.'));
+            }
+            else {
+                output.push(this.visit(node.object, context));
+            }
         }
         output.push('IS');
         if (node.label) {
@@ -8562,6 +8572,76 @@ class Deparser {
                 .join(' ');
             output.push(whenClauses);
         }
+        if (node.returningList && node.returningList.length > 0) {
+            output.push('RETURNING');
+            const returningList = list_utils_1.ListUtils.unwrapList(node.returningList)
+                .map(target => this.visit(target, context))
+                .join(', ');
+            output.push(returningList);
+        }
+        return output.join(' ');
+    }
+    MergeWhenClause(node, context) {
+        const output = ['WHEN'];
+        switch (node.matchKind) {
+            case 'MERGE_WHEN_MATCHED':
+                output.push('MATCHED');
+                break;
+            case 'MERGE_WHEN_NOT_MATCHED_BY_SOURCE':
+                output.push('NOT MATCHED BY SOURCE');
+                break;
+            case 'MERGE_WHEN_NOT_MATCHED_BY_TARGET':
+                output.push('NOT MATCHED');
+                break;
+        }
+        if (node.condition) {
+            output.push('AND');
+            output.push(this.visit(node.condition, context));
+        }
+        output.push('THEN');
+        switch (node.commandType) {
+            case 'CMD_UPDATE': {
+                output.push('UPDATE SET');
+                const assignments = list_utils_1.ListUtils.unwrapList(node.targetList)
+                    .map(target => this.visit(target, context.spawn('UpdateStmt', { update: true })))
+                    .join(', ');
+                output.push(assignments);
+                break;
+            }
+            case 'CMD_INSERT': {
+                output.push('INSERT');
+                const targetList = list_utils_1.ListUtils.unwrapList(node.targetList);
+                if (targetList.length > 0) {
+                    const columns = targetList
+                        .map(target => quotes_1.QuoteUtils.quoteIdentifier(target.ResTarget?.name))
+                        .join(', ');
+                    output.push(`(${columns})`);
+                }
+                if (node.override === 'OVERRIDING_USER_VALUE') {
+                    output.push('OVERRIDING USER VALUE');
+                }
+                else if (node.override === 'OVERRIDING_SYSTEM_VALUE') {
+                    output.push('OVERRIDING SYSTEM VALUE');
+                }
+                const values = list_utils_1.ListUtils.unwrapList(node.values);
+                if (values.length > 0) {
+                    const valueItems = values
+                        .map(value => this.visit(value, context))
+                        .join(', ');
+                    output.push(`VALUES (${valueItems})`);
+                }
+                else {
+                    output.push('DEFAULT VALUES');
+                }
+                break;
+            }
+            case 'CMD_DELETE':
+                output.push('DELETE');
+                break;
+            case 'CMD_NOTHING':
+                output.push('DO NOTHING');
+                break;
+        }
         return output.join(' ');
     }
     AlterTableMoveAllStmt(node, context) {

package/esm/deparser.js

@@ -8053,7 +8053,17 @@ export class Deparser {
             }
         }
         if (node.object) {
-            output.push(this.visit(node.object, context));
+            // Qualified names arrive as a List of String nodes and must be
+            // dot-joined (visiting the List directly would comma-join them).
+            if (typeof node.object === 'object' && 'List' in node.object) {
+                const list = node.object.List;
+                const objectParts = ListUtils.unwrapList(list.items)
+                    .map(item => this.visit(item, context));
+                output.push(objectParts.join('.'));
+            }
+            else {
+                output.push(this.visit(node.object, context));
+            }
         }
         output.push('IS');
         if (node.label) {
@@ -8559,6 +8569,76 @@ export class Deparser {
                 .join(' ');
             output.push(whenClauses);
         }
+        if (node.returningList && node.returningList.length > 0) {
+            output.push('RETURNING');
+            const returningList = ListUtils.unwrapList(node.returningList)
+                .map(target => this.visit(target, context))
+                .join(', ');
+            output.push(returningList);
+        }
+        return output.join(' ');
+    }
+    MergeWhenClause(node, context) {
+        const output = ['WHEN'];
+        switch (node.matchKind) {
+            case 'MERGE_WHEN_MATCHED':
+                output.push('MATCHED');
+                break;
+            case 'MERGE_WHEN_NOT_MATCHED_BY_SOURCE':
+                output.push('NOT MATCHED BY SOURCE');
+                break;
+            case 'MERGE_WHEN_NOT_MATCHED_BY_TARGET':
+                output.push('NOT MATCHED');
+                break;
+        }
+        if (node.condition) {
+            output.push('AND');
+            output.push(this.visit(node.condition, context));
+        }
+        output.push('THEN');
+        switch (node.commandType) {
+            case 'CMD_UPDATE': {
+                output.push('UPDATE SET');
+                const assignments = ListUtils.unwrapList(node.targetList)
+                    .map(target => this.visit(target, context.spawn('UpdateStmt', { update: true })))
+                    .join(', ');
+                output.push(assignments);
+                break;
+            }
+            case 'CMD_INSERT': {
+                output.push('INSERT');
+                const targetList = ListUtils.unwrapList(node.targetList);
+                if (targetList.length > 0) {
+                    const columns = targetList
+                        .map(target => QuoteUtils.quoteIdentifier(target.ResTarget?.name))
+                        .join(', ');
+                    output.push(`(${columns})`);
+                }
+                if (node.override === 'OVERRIDING_USER_VALUE') {
+                    output.push('OVERRIDING USER VALUE');
+                }
+                else if (node.override === 'OVERRIDING_SYSTEM_VALUE') {
+                    output.push('OVERRIDING SYSTEM VALUE');
+                }
+                const values = ListUtils.unwrapList(node.values);
+                if (values.length > 0) {
+                    const valueItems = values
+                        .map(value => this.visit(value, context))
+                        .join(', ');
+                    output.push(`VALUES (${valueItems})`);
+                }
+                else {
+                    output.push('DEFAULT VALUES');
+                }
+                break;
+            }
+            case 'CMD_DELETE':
+                output.push('DELETE');
+                break;
+            case 'CMD_NOTHING':
+                output.push('DO NOTHING');
+                break;
+        }
         return output.join(' ');
     }
     AlterTableMoveAllStmt(node, context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "17.18.4",
+  "version": "17.18.5",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL AST Deparser",
   "main": "index.js",
@@ -60,5 +60,5 @@
     "@pgsql/quotes": "17.1.0",
     "@pgsql/types": "^17.6.2"
   },
-  "gitHead": "987c0c66fee20025b193cb497d1ceb8832dc4ed2"
+  "gitHead": "4213e2c9da8ccb8d21c4ec02f35e34aef65b8ced"
 }