pgsql-deparser 16.1.0 → 16.1.1

package/README.md

@@ -1,20 +1,20 @@
 # pgsql-deparser 
 
 <p align="center" width="100%">
-  <img height="120" src="https://github.com/launchql/pgsql-parser/assets/545047/6440fa7d-918b-4a3b-8d1b-755d85de8bea" />
+  <img height="120" src="https://github.com/constructive-io/pgsql-parser/assets/545047/6440fa7d-918b-4a3b-8d1b-755d85de8bea" />
 </p>
 
 <p align="center" width="100%">
-  <a href="https://github.com/launchql/pgsql-parser/actions/workflows/run-tests.yaml">
-    <img height="20" src="https://github.com/launchql/pgsql-parser/actions/workflows/run-tests.yaml/badge.svg" />
+  <a href="https://github.com/constructive-io/pgsql-parser/actions/workflows/run-tests.yaml">
+    <img height="20" src="https://github.com/constructive-io/pgsql-parser/actions/workflows/run-tests.yaml/badge.svg" />
   </a>
    <a href="https://www.npmjs.com/package/pgsql-deparser"><img height="20" src="https://img.shields.io/npm/dt/pgsql-deparser"></a>
    <a href="https://www.npmjs.com/package/pgsql-deparser"><img height="20" src="https://img.shields.io/npm/dw/pgsql-deparser"/></a>
-   <a href="https://github.com/launchql/pgsql-parser/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"/></a>
-   <a href="https://www.npmjs.com/package/pgsql-deparser"><img height="20" src="https://img.shields.io/github/package-json/v/launchql/pgsql-parser?filename=packages%2Fdeparser%2Fpackage.json"/></a>
+   <a href="https://github.com/constructive-io/pgsql-parser/blob/main/LICENSE-MIT"><img height="20" src="https://img.shields.io/badge/license-MIT-blue.svg"/></a>
+   <a href="https://www.npmjs.com/package/pgsql-deparser"><img height="20" src="https://img.shields.io/github/package-json/v/constructive-io/pgsql-parser?filename=packages%2Fdeparser%2Fpackage.json"/></a>
 </p>
 
-`pgsql-deparser` is the lightning-fast, pure TypeScript solution for converting PostgreSQL ASTs back into SQL queries. Perfect companion to [`pgsql-parser`](https://github.com/launchql/pgsql-parser), this focused tool delivers SQL generation without any native dependencies or WebAssembly overhead.
+`pgsql-deparser` is the lightning-fast, pure TypeScript solution for converting PostgreSQL ASTs back into SQL queries. Perfect companion to [`pgsql-parser`](https://github.com/constructive-io/pgsql-parser), this focused tool delivers SQL generation without any native dependencies or WebAssembly overhead.
 
 ## Installation
 
@@ -33,7 +33,7 @@ npm install pgsql-deparser
 
 The `pgsql-deparser` module serializes ASTs to SQL in pure TypeScript, avoiding the full parser's native dependencies. It's useful when only SQL string conversion from ASTs is needed, and is written in pure TypeScript for easy cross-environment deployment.
 
-Here's how you can use the deparser in your TypeScript code, using [`@pgsql/utils`](https://github.com/launchql/pgsql-parser/tree/main/packages/utils) to create an AST for `deparse`:
+Here's how you can use the deparser in your TypeScript code, using [`@pgsql/utils`](https://github.com/constructive-io/pgsql-parser/tree/main/packages/utils) to create an AST for `deparse`:
 
 ```ts
 import * as t from '@pgsql/utils';
@@ -131,7 +131,7 @@ const sql2 = deparse(selectAst, { pretty: true });
 //   active = true;
 ```
 
-For complete documentation and advanced options, see [DEPARSER_USAGE.md](../../DEPARSER_USAGE.md).
+For complete documentation and advanced options, see [DEPARSER_USAGE.md](https://github.com/constructive-io/pgsql-parser/tree/main/packages/deparser/DEPARSER_USAGE.md).
 
 ## Why Use `pgsql-deparser`?
 
@@ -147,6 +147,8 @@ Built on the excellent work of several contributors:
 * **[Ethan Resnick](https://github.com/ethanresnick)** for the original Node.js N-API bindings
 * **[Zac McCormick](https://github.com/zhm)** for the foundational [node-pg-query-native](https://github.com/zhm/node-pg-query-native) parser
 
+**🛠 Built by the [Constructive](https://constructive.io) team — creators of modular Postgres tooling for secure, composable backends. If you like our work, contribute on [GitHub](https://github.com/constructive-io).**
+
 ## Related
 
 * [pgsql-parser](https://www.npmjs.com/package/pgsql-parser): The real PostgreSQL parser for Node.js, providing symmetric parsing and deparsing of SQL statements with actual PostgreSQL parser integration.
@@ -157,10 +159,10 @@ Built on the excellent work of several contributors:
 * [@pgsql/utils](https://www.npmjs.com/package/@pgsql/utils): A comprehensive utility library for PostgreSQL, offering type-safe AST node creation and enum value conversions, simplifying the construction and manipulation of PostgreSQL ASTs.
 * [@pgsql/traverse](https://www.npmjs.com/package/@pgsql/traverse): PostgreSQL AST traversal utilities for pgsql-parser, providing a visitor pattern for traversing PostgreSQL Abstract Syntax Tree nodes, similar to Babel's traverse functionality but specifically designed for PostgreSQL AST structures.
 * [pg-proto-parser](https://www.npmjs.com/package/pg-proto-parser): A TypeScript tool that parses PostgreSQL Protocol Buffers definitions to generate TypeScript interfaces, utility functions, and JSON mappings for enums.
-* [libpg-query](https://github.com/launchql/libpg-query-node): The real PostgreSQL parser exposed for Node.js, used primarily in `pgsql-parser` for parsing and deparsing SQL queries.
+* [libpg-query](https://github.com/constructive-io/libpg-query-node): The real PostgreSQL parser exposed for Node.js, used primarily in `pgsql-parser` for parsing and deparsing SQL queries.
 
 ## Disclaimer
 
 AS DESCRIBED IN THE LICENSES, THE SOFTWARE IS PROVIDED "AS IS", AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND.
 
-No developer or entity involved in creating Software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the Software code or Software CLI, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.
+No developer or entity involved in creating Software will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of the Software code or Software CLI, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value.

package/deparser/deparser.d.ts

@@ -58,6 +58,11 @@ export declare class Deparser implements DeparserVisitor {
      * @returns The delimiter to use
      */
     private getFunctionDelimiter;
+    /**
+     * Maps ObjectType enum values to their corresponding SQL keywords
+     * Used by AlterOwnerStmt, AlterObjectSchemaStmt, and other statements that need object type keywords
+     */
+    private getObjectTypeKeyword;
     deparse(node: any, context?: DeparserContext): string | null;
     visit(node: any, context?: DeparserContext): string;
     getNodeType(node: any): string;
@@ -172,6 +177,7 @@ export declare class Deparser implements DeparserVisitor {
     AlterTableSpaceOptionsStmt(node: any, context: DeparserContext): string;
     CreateExtensionStmt(node: any, context: DeparserContext): string;
     AlterExtensionStmt(node: any, context: DeparserContext): string;
+    AlterExtensionContentsStmt(node: any, context: DeparserContext): string;
     CreateFdwStmt(node: any, context: DeparserContext): string;
     SetOperationStmt(node: any, context: DeparserContext): string;
     ReplicaIdentityStmt(node: any, context: DeparserContext): string;

package/deparser/deparser.js

@@ -171,6 +171,120 @@ class Deparser {
         }
         return delimiter;
     }
+    /**
+     * Maps ObjectType enum values to their corresponding SQL keywords
+     * Used by AlterOwnerStmt, AlterObjectSchemaStmt, and other statements that need object type keywords
+     */
+    getObjectTypeKeyword(objectType) {
+        switch (objectType) {
+            case 'OBJECT_TABLE':
+                return 'TABLE';
+            case 'OBJECT_VIEW':
+                return 'VIEW';
+            case 'OBJECT_INDEX':
+                return 'INDEX';
+            case 'OBJECT_SEQUENCE':
+                return 'SEQUENCE';
+            case 'OBJECT_FUNCTION':
+                return 'FUNCTION';
+            case 'OBJECT_PROCEDURE':
+                return 'PROCEDURE';
+            case 'OBJECT_SCHEMA':
+                return 'SCHEMA';
+            case 'OBJECT_DATABASE':
+                return 'DATABASE';
+            case 'OBJECT_DOMAIN':
+                return 'DOMAIN';
+            case 'OBJECT_AGGREGATE':
+                return 'AGGREGATE';
+            case 'OBJECT_CONVERSION':
+                return 'CONVERSION';
+            case 'OBJECT_LANGUAGE':
+                return 'LANGUAGE';
+            case 'OBJECT_OPERATOR':
+                return 'OPERATOR';
+            case 'OBJECT_OPFAMILY':
+                return 'OPERATOR FAMILY';
+            case 'OBJECT_OPCLASS':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_TSDICTIONARY':
+                return 'TEXT SEARCH DICTIONARY';
+            case 'OBJECT_TSCONFIGURATION':
+                return 'TEXT SEARCH CONFIGURATION';
+            case 'OBJECT_EVENT_TRIGGER':
+                return 'EVENT TRIGGER';
+            case 'OBJECT_FDW':
+                return 'FOREIGN DATA WRAPPER';
+            case 'OBJECT_FOREIGN_SERVER':
+                return 'SERVER';
+            case 'OBJECT_TYPE':
+                return 'TYPE';
+            case 'OBJECT_COLLATION':
+                return 'COLLATION';
+            case 'OBJECT_PUBLICATION':
+                return 'PUBLICATION';
+            case 'OBJECT_ACCESS_METHOD':
+                return 'ACCESS METHOD';
+            case 'OBJECT_AMOP':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_AMPROC':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_ATTRIBUTE':
+                return 'ATTRIBUTE';
+            case 'OBJECT_CAST':
+                return 'CAST';
+            case 'OBJECT_COLUMN':
+                return 'COLUMN';
+            case 'OBJECT_DEFAULT':
+                return 'DEFAULT';
+            case 'OBJECT_DEFACL':
+                return 'DEFAULT PRIVILEGES';
+            case 'OBJECT_DOMCONSTRAINT':
+                return 'DOMAIN';
+            case 'OBJECT_EXTENSION':
+                return 'EXTENSION';
+            case 'OBJECT_FOREIGN_TABLE':
+                return 'FOREIGN TABLE';
+            case 'OBJECT_LARGEOBJECT':
+                return 'LARGE OBJECT';
+            case 'OBJECT_MATVIEW':
+                return 'MATERIALIZED VIEW';
+            case 'OBJECT_PARAMETER_ACL':
+                return 'PARAMETER';
+            case 'OBJECT_POLICY':
+                return 'POLICY';
+            case 'OBJECT_PUBLICATION_NAMESPACE':
+                return 'PUBLICATION';
+            case 'OBJECT_PUBLICATION_REL':
+                return 'PUBLICATION';
+            case 'OBJECT_ROLE':
+                return 'ROLE';
+            case 'OBJECT_ROUTINE':
+                return 'ROUTINE';
+            case 'OBJECT_RULE':
+                return 'RULE';
+            case 'OBJECT_STATISTIC_EXT':
+                return 'STATISTICS';
+            case 'OBJECT_SUBSCRIPTION':
+                return 'SUBSCRIPTION';
+            case 'OBJECT_TABCONSTRAINT':
+                return 'CONSTRAINT';
+            case 'OBJECT_TABLESPACE':
+                return 'TABLESPACE';
+            case 'OBJECT_TRANSFORM':
+                return 'TRANSFORM';
+            case 'OBJECT_TRIGGER':
+                return 'TRIGGER';
+            case 'OBJECT_TSPARSER':
+                return 'TEXT SEARCH PARSER';
+            case 'OBJECT_TSTEMPLATE':
+                return 'TEXT SEARCH TEMPLATE';
+            case 'OBJECT_USER_MAPPING':
+                return 'USER MAPPING';
+            default:
+                throw new Error(`Unsupported objectType: ${objectType}`);
+        }
+    }
     deparse(node, context) {
         if (node == null) {
             return null;
@@ -2092,10 +2206,13 @@ class Deparser {
             const isFunctionCall = argType === 'FuncCall';
             if (isSimpleArgument || isFunctionCall) {
                 // For simple arguments, avoid :: syntax if they have complex structure
-                if (isSimpleArgument && (arg.includes('(') || arg.startsWith('-'))) {
-                }
-                else {
+                const shouldUseCastSyntax = isSimpleArgument && (arg.includes('(') || arg.startsWith('-'));
+                if (!shouldUseCastSyntax) {
                     const cleanTypeName = typeName.replace('pg_catalog.', '');
+                    // Wrap FuncCall arguments in parentheses to prevent operator precedence issues
+                    if (isFunctionCall) {
+                        return `${context.parens(arg)}::${cleanTypeName}`;
+                    }
                     return `${arg}::${cleanTypeName}`;
                 }
             }
@@ -5610,11 +5727,15 @@ class Deparser {
             if (context.parentNodeTypes.includes('CreateExtensionStmt') || context.parentNodeTypes.includes('AlterExtensionStmt') || context.parentNodeTypes.includes('CreateFdwStmt') || context.parentNodeTypes.includes('AlterFdwStmt')) {
                 // AlterExtensionStmt specific cases
                 if (context.parentNodeTypes.includes('AlterExtensionStmt')) {
-                    if (node.defname === 'to') {
-                        return `TO ${argValue}`;
+                    if (node.defname === 'new_version') {
+                        // argValue is unquoted due to DefElem context, so we need to quote it
+                        const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
+                            ? `'${argValue}'`
+                            : argValue;
+                        return `UPDATE TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
-                        return `SCHEMA ${argValue}`;
+                        return `SET SCHEMA ${argValue}`;
                     }
                 }
                 // CreateFdwStmt specific cases
@@ -5878,6 +5999,34 @@ class Deparser {
         }
         return output.join(' ');
     }
+    AlterExtensionContentsStmt(node, context) {
+        const output = ['ALTER', 'EXTENSION'];
+        if (node.extname) {
+            output.push(this.quoteIfNeeded(node.extname));
+        }
+        // Handle action: 1 = ADD, -1 = DROP
+        if (node.action === 1) {
+            output.push('ADD');
+        }
+        else if (node.action === -1) {
+            output.push('DROP');
+        }
+        // Add object type keyword
+        if (node.objtype) {
+            try {
+                output.push(this.getObjectTypeKeyword(node.objtype));
+            }
+            catch {
+                // Fallback to the raw objtype if not supported
+                output.push(node.objtype.toString());
+            }
+        }
+        // Add the object itself
+        if (node.object) {
+            output.push(this.visit(node.object, context));
+        }
+        return output.join(' ');
+    }
     CreateFdwStmt(node, context) {
         const output = ['CREATE', 'FOREIGN', 'DATA', 'WRAPPER'];
         if (node.fdwname) {
@@ -7584,76 +7733,7 @@ class Deparser {
         if (!node.objectType) {
             throw new Error('AlterOwnerStmt requires objectType');
         }
-        switch (node.objectType) {
-            case 'OBJECT_TABLE':
-                output.push('TABLE');
-                break;
-            case 'OBJECT_VIEW':
-                output.push('VIEW');
-                break;
-            case 'OBJECT_INDEX':
-                output.push('INDEX');
-                break;
-            case 'OBJECT_SEQUENCE':
-                output.push('SEQUENCE');
-                break;
-            case 'OBJECT_FUNCTION':
-                output.push('FUNCTION');
-                break;
-            case 'OBJECT_PROCEDURE':
-                output.push('PROCEDURE');
-                break;
-            case 'OBJECT_SCHEMA':
-                output.push('SCHEMA');
-                break;
-            case 'OBJECT_DATABASE':
-                output.push('DATABASE');
-                break;
-            case 'OBJECT_DOMAIN':
-                output.push('DOMAIN');
-                break;
-            case 'OBJECT_AGGREGATE':
-                output.push('AGGREGATE');
-                break;
-            case 'OBJECT_CONVERSION':
-                output.push('CONVERSION');
-                break;
-            case 'OBJECT_LANGUAGE':
-                output.push('LANGUAGE');
-                break;
-            case 'OBJECT_OPERATOR':
-                output.push('OPERATOR');
-                break;
-            case 'OBJECT_OPFAMILY':
-                output.push('OPERATOR FAMILY');
-                break;
-            case 'OBJECT_OPCLASS':
-                output.push('OPERATOR CLASS');
-                break;
-            case 'OBJECT_TSDICTIONARY':
-                output.push('TEXT SEARCH DICTIONARY');
-                break;
-            case 'OBJECT_TSCONFIGURATION':
-                output.push('TEXT SEARCH CONFIGURATION');
-                break;
-            case 'OBJECT_EVENT_TRIGGER':
-                output.push('EVENT TRIGGER');
-                break;
-            case 'OBJECT_FDW':
-                output.push('FOREIGN DATA WRAPPER');
-                break;
-            case 'OBJECT_FOREIGN_SERVER':
-                output.push('SERVER');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_COLLATION':
-                output.push('COLLATION');
-                break;
-            default:
-                throw new Error(`Unsupported AlterOwnerStmt objectType: ${node.objectType}`);
-        }
+        output.push(this.getObjectTypeKeyword(node.objectType));
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
         }
@@ -10171,66 +10251,12 @@ class Deparser {
     }
     AlterObjectSchemaStmt(node, context) {
         const output = ['ALTER'];
-        switch (node.objectType) {
-            case 'OBJECT_TABLE':
-                output.push('TABLE');
-                break;
-            case 'OBJECT_VIEW':
-                output.push('VIEW');
-                break;
-            case 'OBJECT_FUNCTION':
-                output.push('FUNCTION');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_DOMAIN':
-                output.push('DOMAIN');
-                break;
-            case 'OBJECT_SEQUENCE':
-                output.push('SEQUENCE');
-                break;
-            case 'OBJECT_OPCLASS':
-                output.push('OPERATOR CLASS');
-                break;
-            case 'OBJECT_OPFAMILY':
-                output.push('OPERATOR FAMILY');
-                break;
-            case 'OBJECT_OPERATOR':
-                output.push('OPERATOR');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_COLLATION':
-                output.push('COLLATION');
-                break;
-            case 'OBJECT_CONVERSION':
-                output.push('CONVERSION');
-                break;
-            case 'OBJECT_TSPARSER':
-                output.push('TEXT SEARCH PARSER');
-                break;
-            case 'OBJECT_TSCONFIGURATION':
-                output.push('TEXT SEARCH CONFIGURATION');
-                break;
-            case 'OBJECT_TSTEMPLATE':
-                output.push('TEXT SEARCH TEMPLATE');
-                break;
-            case 'OBJECT_TSDICTIONARY':
-                output.push('TEXT SEARCH DICTIONARY');
-                break;
-            case 'OBJECT_AGGREGATE':
-                output.push('AGGREGATE');
-                break;
-            case 'OBJECT_FOREIGN_TABLE':
-                output.push('FOREIGN TABLE');
-                break;
-            case 'OBJECT_MATVIEW':
-                output.push('MATERIALIZED VIEW');
-                break;
-            default:
-                output.push(node.objectType.toString());
+        try {
+            output.push(this.getObjectTypeKeyword(node.objectType));
+        }
+        catch {
+            // Fallback to objectType string if not supported
+            output.push(node.objectType.toString());
         }
         if (node.missing_ok) {
             output.push('IF EXISTS');

package/esm/deparser/deparser.js

@@ -168,6 +168,120 @@ export class Deparser {
         }
         return delimiter;
     }
+    /**
+     * Maps ObjectType enum values to their corresponding SQL keywords
+     * Used by AlterOwnerStmt, AlterObjectSchemaStmt, and other statements that need object type keywords
+     */
+    getObjectTypeKeyword(objectType) {
+        switch (objectType) {
+            case 'OBJECT_TABLE':
+                return 'TABLE';
+            case 'OBJECT_VIEW':
+                return 'VIEW';
+            case 'OBJECT_INDEX':
+                return 'INDEX';
+            case 'OBJECT_SEQUENCE':
+                return 'SEQUENCE';
+            case 'OBJECT_FUNCTION':
+                return 'FUNCTION';
+            case 'OBJECT_PROCEDURE':
+                return 'PROCEDURE';
+            case 'OBJECT_SCHEMA':
+                return 'SCHEMA';
+            case 'OBJECT_DATABASE':
+                return 'DATABASE';
+            case 'OBJECT_DOMAIN':
+                return 'DOMAIN';
+            case 'OBJECT_AGGREGATE':
+                return 'AGGREGATE';
+            case 'OBJECT_CONVERSION':
+                return 'CONVERSION';
+            case 'OBJECT_LANGUAGE':
+                return 'LANGUAGE';
+            case 'OBJECT_OPERATOR':
+                return 'OPERATOR';
+            case 'OBJECT_OPFAMILY':
+                return 'OPERATOR FAMILY';
+            case 'OBJECT_OPCLASS':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_TSDICTIONARY':
+                return 'TEXT SEARCH DICTIONARY';
+            case 'OBJECT_TSCONFIGURATION':
+                return 'TEXT SEARCH CONFIGURATION';
+            case 'OBJECT_EVENT_TRIGGER':
+                return 'EVENT TRIGGER';
+            case 'OBJECT_FDW':
+                return 'FOREIGN DATA WRAPPER';
+            case 'OBJECT_FOREIGN_SERVER':
+                return 'SERVER';
+            case 'OBJECT_TYPE':
+                return 'TYPE';
+            case 'OBJECT_COLLATION':
+                return 'COLLATION';
+            case 'OBJECT_PUBLICATION':
+                return 'PUBLICATION';
+            case 'OBJECT_ACCESS_METHOD':
+                return 'ACCESS METHOD';
+            case 'OBJECT_AMOP':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_AMPROC':
+                return 'OPERATOR CLASS';
+            case 'OBJECT_ATTRIBUTE':
+                return 'ATTRIBUTE';
+            case 'OBJECT_CAST':
+                return 'CAST';
+            case 'OBJECT_COLUMN':
+                return 'COLUMN';
+            case 'OBJECT_DEFAULT':
+                return 'DEFAULT';
+            case 'OBJECT_DEFACL':
+                return 'DEFAULT PRIVILEGES';
+            case 'OBJECT_DOMCONSTRAINT':
+                return 'DOMAIN';
+            case 'OBJECT_EXTENSION':
+                return 'EXTENSION';
+            case 'OBJECT_FOREIGN_TABLE':
+                return 'FOREIGN TABLE';
+            case 'OBJECT_LARGEOBJECT':
+                return 'LARGE OBJECT';
+            case 'OBJECT_MATVIEW':
+                return 'MATERIALIZED VIEW';
+            case 'OBJECT_PARAMETER_ACL':
+                return 'PARAMETER';
+            case 'OBJECT_POLICY':
+                return 'POLICY';
+            case 'OBJECT_PUBLICATION_NAMESPACE':
+                return 'PUBLICATION';
+            case 'OBJECT_PUBLICATION_REL':
+                return 'PUBLICATION';
+            case 'OBJECT_ROLE':
+                return 'ROLE';
+            case 'OBJECT_ROUTINE':
+                return 'ROUTINE';
+            case 'OBJECT_RULE':
+                return 'RULE';
+            case 'OBJECT_STATISTIC_EXT':
+                return 'STATISTICS';
+            case 'OBJECT_SUBSCRIPTION':
+                return 'SUBSCRIPTION';
+            case 'OBJECT_TABCONSTRAINT':
+                return 'CONSTRAINT';
+            case 'OBJECT_TABLESPACE':
+                return 'TABLESPACE';
+            case 'OBJECT_TRANSFORM':
+                return 'TRANSFORM';
+            case 'OBJECT_TRIGGER':
+                return 'TRIGGER';
+            case 'OBJECT_TSPARSER':
+                return 'TEXT SEARCH PARSER';
+            case 'OBJECT_TSTEMPLATE':
+                return 'TEXT SEARCH TEMPLATE';
+            case 'OBJECT_USER_MAPPING':
+                return 'USER MAPPING';
+            default:
+                throw new Error(`Unsupported objectType: ${objectType}`);
+        }
+    }
     deparse(node, context) {
         if (node == null) {
             return null;
@@ -2089,10 +2203,13 @@ export class Deparser {
             const isFunctionCall = argType === 'FuncCall';
             if (isSimpleArgument || isFunctionCall) {
                 // For simple arguments, avoid :: syntax if they have complex structure
-                if (isSimpleArgument && (arg.includes('(') || arg.startsWith('-'))) {
-                }
-                else {
+                const shouldUseCastSyntax = isSimpleArgument && (arg.includes('(') || arg.startsWith('-'));
+                if (!shouldUseCastSyntax) {
                     const cleanTypeName = typeName.replace('pg_catalog.', '');
+                    // Wrap FuncCall arguments in parentheses to prevent operator precedence issues
+                    if (isFunctionCall) {
+                        return `${context.parens(arg)}::${cleanTypeName}`;
+                    }
                     return `${arg}::${cleanTypeName}`;
                 }
             }
@@ -5607,11 +5724,15 @@ export class Deparser {
             if (context.parentNodeTypes.includes('CreateExtensionStmt') || context.parentNodeTypes.includes('AlterExtensionStmt') || context.parentNodeTypes.includes('CreateFdwStmt') || context.parentNodeTypes.includes('AlterFdwStmt')) {
                 // AlterExtensionStmt specific cases
                 if (context.parentNodeTypes.includes('AlterExtensionStmt')) {
-                    if (node.defname === 'to') {
-                        return `TO ${argValue}`;
+                    if (node.defname === 'new_version') {
+                        // argValue is unquoted due to DefElem context, so we need to quote it
+                        const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
+                            ? `'${argValue}'`
+                            : argValue;
+                        return `UPDATE TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
-                        return `SCHEMA ${argValue}`;
+                        return `SET SCHEMA ${argValue}`;
                     }
                 }
                 // CreateFdwStmt specific cases
@@ -5875,6 +5996,34 @@ export class Deparser {
         }
         return output.join(' ');
     }
+    AlterExtensionContentsStmt(node, context) {
+        const output = ['ALTER', 'EXTENSION'];
+        if (node.extname) {
+            output.push(this.quoteIfNeeded(node.extname));
+        }
+        // Handle action: 1 = ADD, -1 = DROP
+        if (node.action === 1) {
+            output.push('ADD');
+        }
+        else if (node.action === -1) {
+            output.push('DROP');
+        }
+        // Add object type keyword
+        if (node.objtype) {
+            try {
+                output.push(this.getObjectTypeKeyword(node.objtype));
+            }
+            catch {
+                // Fallback to the raw objtype if not supported
+                output.push(node.objtype.toString());
+            }
+        }
+        // Add the object itself
+        if (node.object) {
+            output.push(this.visit(node.object, context));
+        }
+        return output.join(' ');
+    }
     CreateFdwStmt(node, context) {
         const output = ['CREATE', 'FOREIGN', 'DATA', 'WRAPPER'];
         if (node.fdwname) {
@@ -7581,76 +7730,7 @@ export class Deparser {
         if (!node.objectType) {
             throw new Error('AlterOwnerStmt requires objectType');
         }
-        switch (node.objectType) {
-            case 'OBJECT_TABLE':
-                output.push('TABLE');
-                break;
-            case 'OBJECT_VIEW':
-                output.push('VIEW');
-                break;
-            case 'OBJECT_INDEX':
-                output.push('INDEX');
-                break;
-            case 'OBJECT_SEQUENCE':
-                output.push('SEQUENCE');
-                break;
-            case 'OBJECT_FUNCTION':
-                output.push('FUNCTION');
-                break;
-            case 'OBJECT_PROCEDURE':
-                output.push('PROCEDURE');
-                break;
-            case 'OBJECT_SCHEMA':
-                output.push('SCHEMA');
-                break;
-            case 'OBJECT_DATABASE':
-                output.push('DATABASE');
-                break;
-            case 'OBJECT_DOMAIN':
-                output.push('DOMAIN');
-                break;
-            case 'OBJECT_AGGREGATE':
-                output.push('AGGREGATE');
-                break;
-            case 'OBJECT_CONVERSION':
-                output.push('CONVERSION');
-                break;
-            case 'OBJECT_LANGUAGE':
-                output.push('LANGUAGE');
-                break;
-            case 'OBJECT_OPERATOR':
-                output.push('OPERATOR');
-                break;
-            case 'OBJECT_OPFAMILY':
-                output.push('OPERATOR FAMILY');
-                break;
-            case 'OBJECT_OPCLASS':
-                output.push('OPERATOR CLASS');
-                break;
-            case 'OBJECT_TSDICTIONARY':
-                output.push('TEXT SEARCH DICTIONARY');
-                break;
-            case 'OBJECT_TSCONFIGURATION':
-                output.push('TEXT SEARCH CONFIGURATION');
-                break;
-            case 'OBJECT_EVENT_TRIGGER':
-                output.push('EVENT TRIGGER');
-                break;
-            case 'OBJECT_FDW':
-                output.push('FOREIGN DATA WRAPPER');
-                break;
-            case 'OBJECT_FOREIGN_SERVER':
-                output.push('SERVER');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_COLLATION':
-                output.push('COLLATION');
-                break;
-            default:
-                throw new Error(`Unsupported AlterOwnerStmt objectType: ${node.objectType}`);
-        }
+        output.push(this.getObjectTypeKeyword(node.objectType));
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
         }
@@ -10168,66 +10248,12 @@ export class Deparser {
     }
     AlterObjectSchemaStmt(node, context) {
         const output = ['ALTER'];
-        switch (node.objectType) {
-            case 'OBJECT_TABLE':
-                output.push('TABLE');
-                break;
-            case 'OBJECT_VIEW':
-                output.push('VIEW');
-                break;
-            case 'OBJECT_FUNCTION':
-                output.push('FUNCTION');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_DOMAIN':
-                output.push('DOMAIN');
-                break;
-            case 'OBJECT_SEQUENCE':
-                output.push('SEQUENCE');
-                break;
-            case 'OBJECT_OPCLASS':
-                output.push('OPERATOR CLASS');
-                break;
-            case 'OBJECT_OPFAMILY':
-                output.push('OPERATOR FAMILY');
-                break;
-            case 'OBJECT_OPERATOR':
-                output.push('OPERATOR');
-                break;
-            case 'OBJECT_TYPE':
-                output.push('TYPE');
-                break;
-            case 'OBJECT_COLLATION':
-                output.push('COLLATION');
-                break;
-            case 'OBJECT_CONVERSION':
-                output.push('CONVERSION');
-                break;
-            case 'OBJECT_TSPARSER':
-                output.push('TEXT SEARCH PARSER');
-                break;
-            case 'OBJECT_TSCONFIGURATION':
-                output.push('TEXT SEARCH CONFIGURATION');
-                break;
-            case 'OBJECT_TSTEMPLATE':
-                output.push('TEXT SEARCH TEMPLATE');
-                break;
-            case 'OBJECT_TSDICTIONARY':
-                output.push('TEXT SEARCH DICTIONARY');
-                break;
-            case 'OBJECT_AGGREGATE':
-                output.push('AGGREGATE');
-                break;
-            case 'OBJECT_FOREIGN_TABLE':
-                output.push('FOREIGN TABLE');
-                break;
-            case 'OBJECT_MATVIEW':
-                output.push('MATERIALIZED VIEW');
-                break;
-            default:
-                output.push(node.objectType.toString());
+        try {
+            output.push(this.getObjectTypeKeyword(node.objectType));
+        }
+        catch {
+            // Fallback to objectType string if not supported
+            output.push(node.objectType.toString());
         }
         if (node.missing_ok) {
             output.push('IF EXISTS');

package/package.json

@@ -1,6 +1,6 @@
 {
-  "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/launchql/pgsql-parser",
+  "author": "Constructive <developers@constructive.io>",
+  "homepage": "https://github.com/constructive-io/pgsql-parser",
   "license": "MIT",
   "main": "index.js",
   "module": "esm/index.js",
@@ -18,10 +18,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/launchql/pgsql-parser"
+    "url": "https://github.com/constructive-io/pgsql-parser"
   },
   "bugs": {
-    "url": "https://github.com/launchql/pgsql-parser/issues"
+    "url": "https://github.com/constructive-io/pgsql-parser/issues"
   },
   "keywords": [
     "sql",
@@ -34,7 +34,7 @@
     "database"
   ],
   "name": "pgsql-deparser",
-  "version": "16.1.0",
+  "version": "16.1.1",
   "dependencies": {
     "@pgsql/types": "^16.1.1"
   }