pgsql-deparser 14.1.0 → 14.2.0

package/esm/deparser/deparser.js

@@ -2,10 +2,29 @@
  * Auto-generated file with types stripped for better tree-shaking
  * DO NOT EDIT - Generated by strip-deparser-types.ts
  */
-import { DeparserContext } from './visitors/base';
-import { SqlFormatter } from './utils/sql-formatter';
-import { QuoteUtils } from './utils/quote-utils';
+import { keywordKindOf, QuoteUtils } from '@pgsql/quotes';
 import { ListUtils } from './utils/list-utils';
+import { SqlFormatter } from './utils/sql-formatter';
+import { DeparserContext } from './visitors/base';
+// WindowDef.frameOptions bit flags (src/include/nodes/parsenodes.h)
+const FRAMEOPTION_NONDEFAULT = 0x00001;
+const FRAMEOPTION_RANGE = 0x00002;
+const FRAMEOPTION_ROWS = 0x00004;
+const FRAMEOPTION_GROUPS = 0x00008;
+const FRAMEOPTION_BETWEEN = 0x00010;
+const FRAMEOPTION_START_UNBOUNDED_PRECEDING = 0x00020;
+const FRAMEOPTION_END_UNBOUNDED_PRECEDING = 0x00040;
+const FRAMEOPTION_START_UNBOUNDED_FOLLOWING = 0x00080;
+const FRAMEOPTION_END_UNBOUNDED_FOLLOWING = 0x00100;
+const FRAMEOPTION_START_CURRENT_ROW = 0x00200;
+const FRAMEOPTION_END_CURRENT_ROW = 0x00400;
+const FRAMEOPTION_START_OFFSET_PRECEDING = 0x00800;
+const FRAMEOPTION_END_OFFSET_PRECEDING = 0x01000;
+const FRAMEOPTION_START_OFFSET_FOLLOWING = 0x02000;
+const FRAMEOPTION_END_OFFSET_FOLLOWING = 0x04000;
+const FRAMEOPTION_EXCLUDE_CURRENT_ROW = 0x08000;
+const FRAMEOPTION_EXCLUDE_GROUP = 0x10000;
+const FRAMEOPTION_EXCLUDE_TIES = 0x20000;
 /**
  * List of real PostgreSQL built-in types as they appear in pg_catalog.pg_type.typname.
  * These are stored in lowercase in PostgreSQL system catalogs.
@@ -104,6 +123,36 @@ function isWrappedParseResult(obj) {
  * The deparser automatically detects bare ParseResult objects for backward
  * compatibility and wraps them internally for consistent processing.
  */
+function formatBitString(bsval) {
+    const quote = (value) => value.replace(/'/g, "''");
+    if (/^x[0-9A-Fa-f]*$/.test(bsval)) {
+        return `x'${bsval.substring(1)}'`;
+    }
+    if (bsval.startsWith('b')) {
+        return `b'${quote(bsval.substring(1))}'`;
+    }
+    return `b'${quote(bsval)}'`;
+}
+// A dollar-quoted body ends at the first occurrence of its tag, including one
+// formed by the body's trailing characters plus the closing tag (`...$` + `$$`).
+function dollarTagConflicts(body, tag) {
+    return (body + tag).indexOf(tag) < body.length;
+}
+const NUMERIC_LITERAL = /^[+-]?(?:0[xX](?:_?[0-9A-Fa-f])+|0[oO](?:_?[0-7])+|0[bB](?:_?[01])+|(?:\d(?:_?\d)*(?:\.(?:\d(?:_?\d)*)?)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)$/;
+function formatInteger(ival) {
+    const value = String(ival);
+    if (!/^[+-]?\d+$/.test(value)) {
+        throw new Error(`Invalid integer literal: ${value}`);
+    }
+    return value;
+}
+function formatNumeric(fval) {
+    const value = String(fval);
+    if (!NUMERIC_LITERAL.test(value)) {
+        throw new Error(`Invalid numeric literal: ${value}`);
+    }
+    return value;
+}
 export class Deparser {
     tree;
     options;
@@ -163,10 +212,133 @@ export class Deparser {
      */
     getFunctionDelimiter(body) {
         const delimiter = this.options.functionDelimiter || '$$';
-        if (body.includes(delimiter)) {
-            return this.options.functionDelimiterFallback || '$EOFCODE$';
+        if (!dollarTagConflicts(body, delimiter)) {
+            return delimiter;
+        }
+        const fallback = this.options.functionDelimiterFallback || '$EOFCODE$';
+        if (!dollarTagConflicts(body, fallback)) {
+            return fallback;
+        }
+        const base = fallback.slice(0, -1);
+        let counter = 1;
+        while (dollarTagConflicts(body, `${base}${counter}$`)) {
+            counter++;
+        }
+        return `${base}${counter}$`;
+    }
+    /**
+     * 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}`);
         }
-        return delimiter;
     }
     deparse(node, context) {
         if (node == null) {
@@ -329,12 +501,7 @@ export class Deparser {
                     // Check if single target is complex - if so, use multiline format
                     if (this.isComplexSelectTarget(targetNode)) {
                         output.push('SELECT' + distinctPart);
-                        if (this.containsMultilineStringLiteral(target)) {
-                            output.push(target);
-                        }
-                        else {
-                            output.push(context.indent(target));
-                        }
+                        output.push(context.indent(target));
                     }
                     else {
                         output.push('SELECT' + distinctPart + ' ' + target);
@@ -344,9 +511,6 @@ export class Deparser {
                     const targetStrings = targetList
                         .map(e => {
                         const targetStr = this.visit(e, context.spawn('SelectStmt', { select: true }));
-                        if (this.containsMultilineStringLiteral(targetStr)) {
-                            return targetStr;
-                        }
                         return context.indent(targetStr);
                     });
                     const formattedTargets = targetStrings.join(',' + context.newline());
@@ -398,9 +562,6 @@ export class Deparser {
                     return context.parens(values.join(', '));
                 });
                 const indentedTuples = lists.map(tuple => {
-                    if (this.containsMultilineStringLiteral(tuple)) {
-                        return tuple;
-                    }
                     return context.indent(tuple);
                 });
                 output.push(indentedTuples.join(',\n'));
@@ -420,9 +581,6 @@ export class Deparser {
                 const groupItems = groupList
                     .map(e => {
                     const groupStr = this.visit(e, context.spawn('SelectStmt', { group: true, indentLevel: context.indentLevel + 1 }));
-                    if (this.containsMultilineStringLiteral(groupStr)) {
-                        return groupStr;
-                    }
                     return context.indent(groupStr);
                 })
                     .join(',' + context.newline());
@@ -441,12 +599,7 @@ export class Deparser {
             if (context.isPretty()) {
                 output.push('HAVING');
                 const havingStr = this.visit(node.havingClause, context);
-                if (this.containsMultilineStringLiteral(havingStr)) {
-                    output.push(havingStr);
-                }
-                else {
-                    output.push(context.indent(havingStr));
-                }
+                output.push(context.indent(havingStr));
             }
             else {
                 output.push('HAVING');
@@ -467,9 +620,6 @@ export class Deparser {
                 const sortItems = sortList
                     .map(e => {
                     const sortStr = this.visit(e, context.spawn('SelectStmt', { sort: true, indentLevel: context.indentLevel + 1 }));
-                    if (this.containsMultilineStringLiteral(sortStr)) {
-                        return sortStr;
-                    }
                     return context.indent(sortStr);
                 })
                     .join(',' + context.newline());
@@ -545,10 +695,15 @@ export class Deparser {
                     return context.format([leftExpr, operator, rightExpr]);
                 }
                 else if (rexpr) {
-                    return context.format([
-                        this.deparseOperatorName(name, context),
-                        this.visit(rexpr, context)
-                    ]);
+                    // Unary operator (e.g., unary minus: - expr)
+                    const operator = this.deparseOperatorName(name, context);
+                    let rightExpr = this.visit(rexpr, context);
+                    // Wrap in parentheses if rexpr is a binary A_Expr to preserve semantics
+                    // e.g., -(a - b) must stay -(a - b), not become -a - b
+                    if (rexpr && 'A_Expr' in rexpr && rexpr.A_Expr?.kind === 'AEXPR_OP' && rexpr.A_Expr?.lexpr) {
+                        rightExpr = context.parens(rightExpr);
+                    }
+                    return context.format([operator, rightExpr]);
                 }
                 break;
             case 'AEXPR_OP_ANY':
@@ -728,15 +883,15 @@ export class Deparser {
     getOperatorPrecedence(operator) {
         const precedence = {
             '||': 1, // string concatenation
-            'OR': 2, // logical OR
-            'AND': 3, // logical AND
-            'NOT': 4, // logical NOT
-            'IS': 5, // IS NULL, IS NOT NULL, etc.
-            'IN': 5, // IN, NOT IN
-            'BETWEEN': 5, // BETWEEN, NOT BETWEEN
-            'LIKE': 5, // LIKE, ILIKE, SIMILAR TO
-            'ILIKE': 5,
-            'SIMILAR': 5,
+            OR: 2, // logical OR
+            AND: 3, // logical AND
+            NOT: 4, // logical NOT
+            IS: 5, // IS NULL, IS NOT NULL, etc.
+            IN: 5, // IN, NOT IN
+            BETWEEN: 5, // BETWEEN, NOT BETWEEN
+            LIKE: 5, // LIKE, ILIKE, SIMILAR TO
+            ILIKE: 5,
+            SIMILAR: 5,
             '<': 6, // comparison operators
             '<=': 6,
             '>': 6,
@@ -866,6 +1021,12 @@ export class Deparser {
                 output.push(context.parens(columnNames.join(', ')));
             }
         }
+        if (node.override === 'OVERRIDING_USER_VALUE') {
+            output.push('OVERRIDING USER VALUE');
+        }
+        else if (node.override === 'OVERRIDING_SYSTEM_VALUE') {
+            output.push('OVERRIDING SYSTEM VALUE');
+        }
         if (node.selectStmt) {
             output.push(this.visit(node.selectStmt, context));
         }
@@ -908,7 +1069,14 @@ export class Deparser {
                     else {
                         const updateContext = context.spawn('UpdateStmt', { update: true });
                         const targets = targetList.map(target => this.visit(target, updateContext));
-                        output.push(targets.join(', '));
+                        if (context.isPretty()) {
+                            // Put each assignment on its own line for pretty printing
+                            const indentedTargets = targets.map(target => context.indent(target));
+                            output[output.length - 1] += '\n' + indentedTargets.join(',\n');
+                        }
+                        else {
+                            output.push(targets.join(', '));
+                        }
                     }
                 }
                 if (node.onConflictClause.whereClause) {
@@ -920,11 +1088,8 @@ export class Deparser {
                 output.push('DO NOTHING');
             }
         }
-        if (node.returningList) {
-            output.push('RETURNING');
-            const returningList = ListUtils.unwrapList(node.returningList);
-            const returns = returningList.map(ret => this.visit(ret, context));
-            output.push(returns.join(', '));
+        if (node.returningClause) {
+            output.push(this.ReturningClause(node.returningClause, context));
         }
         return output.join(' ');
     }
@@ -938,38 +1103,8 @@ export class Deparser {
             output.push(this.RangeVar(node.relation, context));
         }
         output.push('SET');
-        const targetList = ListUtils.unwrapList(node.targetList);
-        if (targetList && targetList.length) {
-            const firstTarget = targetList[0];
-            const processedTargets = new Set();
-            const assignmentParts = [];
-            for (let i = 0; i < targetList.length; i++) {
-                if (processedTargets.has(i))
-                    continue;
-                const target = targetList[i];
-                const multiAssignRef = target.ResTarget?.val?.MultiAssignRef;
-                if (multiAssignRef) {
-                    const relatedTargets = [];
-                    for (let j = i; j < targetList.length; j++) {
-                        const otherTarget = targetList[j];
-                        const otherMultiAssignRef = otherTarget.ResTarget?.val?.MultiAssignRef;
-                        if (otherMultiAssignRef &&
-                            JSON.stringify(otherMultiAssignRef.source) === JSON.stringify(multiAssignRef.source)) {
-                            relatedTargets.push(otherTarget);
-                            processedTargets.add(j);
-                        }
-                    }
-                    const names = relatedTargets.map(t => t.ResTarget.name);
-                    const multiAssignment = `${context.parens(names.join(', '))} = ${this.visit(multiAssignRef.source, context)}`;
-                    assignmentParts.push(multiAssignment);
-                }
-                else {
-                    // Handle regular single-column assignment
-                    assignmentParts.push(this.visit(target, context.spawn('UpdateStmt', { update: true })));
-                    processedTargets.add(i);
-                }
-            }
-            output.push(assignmentParts.join(','));
+        if (node.targetList && node.targetList.length > 0) {
+            output.push(this.formatUpdateAssignments(node.targetList, context));
         }
         if (node.fromClause) {
             output.push('FROM');
@@ -981,12 +1116,41 @@ export class Deparser {
             output.push('WHERE');
             output.push(this.visit(node.whereClause, context));
         }
-        if (node.returningList) {
-            output.push('RETURNING');
-            output.push(this.deparseReturningList(node.returningList, context));
+        if (node.returningClause) {
+            output.push(this.ReturningClause(node.returningClause, context));
         }
         return output.join(' ');
     }
+    formatUpdateAssignments(targets, context) {
+        const targetList = ListUtils.unwrapList(targets);
+        const processedTargets = new Set();
+        const assignmentParts = [];
+        for (let i = 0; i < targetList.length; i++) {
+            if (processedTargets.has(i))
+                continue;
+            const target = targetList[i];
+            const multiAssignRef = target.ResTarget?.val?.MultiAssignRef;
+            if (multiAssignRef) {
+                const relatedTargets = [];
+                for (let j = i; j < targetList.length; j++) {
+                    const otherTarget = targetList[j];
+                    const otherMultiAssignRef = otherTarget.ResTarget?.val?.MultiAssignRef;
+                    if (otherMultiAssignRef &&
+                        JSON.stringify(otherMultiAssignRef.source) === JSON.stringify(multiAssignRef.source)) {
+                        relatedTargets.push(otherTarget);
+                        processedTargets.add(j);
+                    }
+                }
+                const names = relatedTargets.map(t => QuoteUtils.quoteIdentifier(t.ResTarget.name));
+                assignmentParts.push(`${context.parens(names.join(', '))} = ${this.visit(multiAssignRef.source, context)}`);
+            }
+            else {
+                assignmentParts.push(this.visit(target, context.spawn('UpdateStmt', { update: true })));
+                processedTargets.add(i);
+            }
+        }
+        return assignmentParts.join(', ');
+    }
     DeleteStmt(node, context) {
         try {
             const output = [];
@@ -1034,13 +1198,12 @@ export class Deparser {
                     throw new Error(`Error deparsing DeleteStmt: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }
-            if (node.returningList) {
-                output.push('RETURNING');
+            if (node.returningClause) {
                 try {
-                    output.push(this.deparseReturningList(node.returningList, context));
+                    output.push(this.ReturningClause(node.returningClause, context));
                 }
                 catch (error) {
-                    console.warn(`Error processing returningList in DeleteStmt: ${error instanceof Error ? error.message : String(error)}`);
+                    console.warn(`Error processing returningClause in DeleteStmt: ${error instanceof Error ? error.message : String(error)}`);
                     throw new Error(`Error deparsing DeleteStmt: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }
@@ -1061,9 +1224,6 @@ export class Deparser {
                 const cteStrings = ctes.map((cte, index) => {
                     const cteStr = this.visit(cte, context);
                     const prefix = index === 0 ? context.newline() : ',' + context.newline();
-                    if (this.containsMultilineStringLiteral(cteStr)) {
-                        return prefix + cteStr;
-                    }
                     return prefix + context.indent(cteStr);
                 });
                 output.push(cteStrings.join(''));
@@ -1078,12 +1238,12 @@ export class Deparser {
     ResTarget(node, context) {
         const output = [];
         if (context.update && node.name) {
-            output.push(QuoteUtils.quote(node.name));
+            output.push(QuoteUtils.quoteIdentifier(node.name));
             // Handle indirection (array indexing, field access, etc.)
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStrs = ListUtils.unwrapList(node.indirection).map(item => {
                     if (item.String) {
-                        return `.${QuoteUtils.quote(item.String.sval || item.String.str)}`;
+                        return `.${QuoteUtils.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
                     }
                     return this.visit(item, context);
                 });
@@ -1095,12 +1255,12 @@ export class Deparser {
             }
         }
         else if (context.insertColumns && node.name) {
-            output.push(QuoteUtils.quote(node.name));
+            output.push(QuoteUtils.quoteIdentifier(node.name));
             // Handle indirection for INSERT column lists (e.g., q.c1.r)
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStrs = ListUtils.unwrapList(node.indirection).map(item => {
                     if (item.String) {
-                        return `.${QuoteUtils.quote(item.String.sval || item.String.str)}`;
+                        return `.${QuoteUtils.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
                     }
                     return this.visit(item, context);
                 });
@@ -1113,11 +1273,53 @@ export class Deparser {
             }
             if (node.name) {
                 output.push('AS');
-                output.push(QuoteUtils.quote(node.name));
+                output.push(QuoteUtils.quoteIdentifier(node.name));
+            }
+        }
+        return output.join(' ');
+    }
+    ATAlterConstraint(node, context) {
+        const output = ['ALTER CONSTRAINT'];
+        if (node.conname) {
+            output.push(QuoteUtils.quoteIdentifier(node.conname));
+        }
+        if (node.alterEnforceability) {
+            output.push(node.is_enforced ? 'ENFORCED' : 'NOT ENFORCED');
+        }
+        if (node.alterDeferrability) {
+            output.push(node.deferrable ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+            if (node.initdeferred) {
+                output.push('INITIALLY DEFERRED');
             }
         }
+        if (node.alterInheritability) {
+            output.push(node.noinherit ? 'NO INHERIT' : 'INHERIT');
+        }
+        return output.join(' ');
+    }
+    deparseKeyAttrs(attrs, withPeriod, context) {
+        const items = ListUtils.unwrapList(attrs).map(attr => this.visit(attr, context));
+        if (withPeriod && items.length > 0) {
+            items[items.length - 1] = `PERIOD ${items[items.length - 1]}`;
+        }
+        return items.join(', ');
+    }
+    ReturningClause(node, context) {
+        const output = ['RETURNING'];
+        if (node.options && node.options.length > 0) {
+            const options = ListUtils.unwrapList(node.options)
+                .map(option => this.visit(option, context));
+            output.push(`WITH (${options.join(', ')})`);
+        }
+        if (node.exprs && node.exprs.length > 0) {
+            output.push(this.deparseReturningList(node.exprs, context));
+        }
         return output.join(' ');
     }
+    ReturningOption(node, context) {
+        const keyword = node.option === 'RETURNING_OPTION_NEW' ? 'NEW' : 'OLD';
+        return `${keyword} AS ${QuoteUtils.quoteIdentifier(node.value)}`;
+    }
     deparseReturningList(list, context) {
         return ListUtils.unwrapList(list)
             .filter(item => item != null && this.getNodeType(item) !== 'undefined')
@@ -1127,7 +1329,7 @@ export class Deparser {
                 if (this.getNodeType(item) === 'ResTarget') {
                     const resTarget = this.getNodeData(item);
                     const val = resTarget.val ? this.visit(resTarget.val, context) : '';
-                    const alias = resTarget.name ? ` AS ${QuoteUtils.quote(resTarget.name)}` : '';
+                    const alias = resTarget.name ? ` AS ${QuoteUtils.quoteIdentifier(resTarget.name)}` : '';
                     return val + alias;
                 }
                 else {
@@ -1182,7 +1384,8 @@ export class Deparser {
     FuncCall(node, context) {
         const funcname = ListUtils.unwrapList(node.funcname);
         const args = ListUtils.unwrapList(node.args);
-        const name = funcname.map(n => this.visit(n, context)).join('.');
+        const funcnameParts = funcname.map((n) => n.String?.sval || n.String?.str || '').filter((s) => s);
+        const name = QuoteUtils.quoteDottedName(funcnameParts);
         // Handle special SQL syntax functions like XMLEXISTS and EXTRACT
         if (node.funcformat === 'COERCE_SQL_SYNTAX' && name === 'pg_catalog.xmlexists' && args.length >= 2) {
             const xpath = this.visit(args[0], context);
@@ -1191,8 +1394,15 @@ export class Deparser {
         }
         // Handle EXTRACT function with SQL syntax
         if (node.funcformat === 'COERCE_SQL_SYNTAX' && name === 'pg_catalog.extract' && args.length >= 2) {
-            const field = this.visit(args[0], context);
+            let field = this.visit(args[0], context);
             const source = this.visit(args[1], context);
+            // EXTRACT requires an unquoted uppercase keyword (EPOCH, YEAR, etc.)
+            // but A_Const sval deparsing wraps it in single quotes — strip and uppercase
+            // only when it is spelled the way the bare-keyword form parses back
+            if (/^'(?:year|month|day|hour|minute|second)'$/.test(field)
+                || (/^'[a-z_][a-z0-9_]*'$/.test(field) && keywordKindOf(field.slice(1, -1)) === 'NO_KEYWORD')) {
+                field = field.slice(1, -1).toUpperCase();
+            }
             return `EXTRACT(${field} FROM ${source})`;
         }
         // Handle TRIM function with SQL syntax (TRIM TRAILING/LEADING/BOTH)
@@ -1352,43 +1562,41 @@ export class Deparser {
             result += ` FILTER (WHERE ${this.visit(node.agg_filter, context)})`;
         }
         if (node.over) {
-            // Handle named window references first
-            if (node.over.name) {
-                result += ` OVER ${node.over.name}`;
-            }
-            else {
-                const windowParts = [];
-                if (node.over.partitionClause) {
-                    const partitions = ListUtils.unwrapList(node.over.partitionClause);
-                    const partitionStrs = partitions.map(p => this.visit(p, context));
-                    windowParts.push(`PARTITION BY ${partitionStrs.join(', ')}`);
-                }
-                if (node.over.orderClause) {
-                    const orders = ListUtils.unwrapList(node.over.orderClause);
-                    const orderStrs = orders.map(o => this.visit(o, context));
-                    windowParts.push(`ORDER BY ${orderStrs.join(', ')}`);
-                }
-                // Handle window frame specifications using the dedicated formatWindowFrame method
-                const frameClause = this.formatWindowFrame(node.over, context.spawn('FuncCall'));
-                if (frameClause) {
-                    windowParts.push(frameClause);
-                }
-                if (windowParts.length > 0) {
-                    if (context.isPretty() && windowParts.length > 1) {
-                        const formattedParts = windowParts.map(part => context.indent(part));
-                        result += ` OVER (${context.newline()}${formattedParts.join(context.newline())}${context.newline()})`;
-                    }
-                    else {
-                        result += ` OVER (${windowParts.join(' ')})`;
-                    }
-                }
-                else {
-                    result += ` OVER ()`;
-                }
-            }
+            result += this.formatOverClause(node.over, context);
         }
         return result;
     }
+    formatOverClause(over, context) {
+        if (over.name) {
+            return ` OVER ${over.name}`;
+        }
+        const windowParts = [];
+        if (over.refname) {
+            windowParts.push(over.refname);
+        }
+        if (over.partitionClause) {
+            const partitions = ListUtils.unwrapList(over.partitionClause);
+            const partitionStrs = partitions.map(p => this.visit(p, context));
+            windowParts.push(`PARTITION BY ${partitionStrs.join(', ')}`);
+        }
+        if (over.orderClause) {
+            const orders = ListUtils.unwrapList(over.orderClause);
+            const orderStrs = orders.map(o => this.visit(o, context));
+            windowParts.push(`ORDER BY ${orderStrs.join(', ')}`);
+        }
+        const frameClause = this.formatWindowFrame(over, context.spawn('FuncCall'));
+        if (frameClause) {
+            windowParts.push(frameClause);
+        }
+        if (windowParts.length === 0) {
+            return ' OVER ()';
+        }
+        if (context.isPretty() && windowParts.length > 1) {
+            const formattedParts = windowParts.map(part => context.indent(part));
+            return ` OVER (${context.newline()}${formattedParts.join(context.newline())}${context.newline()})`;
+        }
+        return ` OVER (${windowParts.join(' ')})`;
+    }
     FuncExpr(node, context) {
         const funcName = `func_${node.funcid}`;
         const args = node.args ? ListUtils.unwrapList(node.args).map(arg => this.visit(arg, context)).join(', ') : '';
@@ -1399,39 +1607,39 @@ export class Deparser {
         if (nodeAny.ival !== undefined) {
             if (typeof nodeAny.ival === 'object' && nodeAny.ival !== null) {
                 if (nodeAny.ival.ival !== undefined) {
-                    return nodeAny.ival.ival.toString();
+                    return formatInteger(nodeAny.ival.ival);
                 }
                 else if (Object.keys(nodeAny.ival).length === 0) {
                     return '0';
                 }
                 else {
-                    return nodeAny.ival.toString();
+                    return formatInteger(nodeAny.ival);
                 }
             }
             else if (nodeAny.ival === null) {
                 return 'NULL';
             }
             else {
-                return nodeAny.ival.toString();
+                return formatInteger(nodeAny.ival);
             }
         }
         else if (nodeAny.fval !== undefined) {
             if (typeof nodeAny.fval === 'object' && nodeAny.fval !== null) {
                 if (nodeAny.fval.fval !== undefined) {
-                    return nodeAny.fval.fval.toString();
+                    return formatNumeric(nodeAny.fval.fval);
                 }
                 else if (Object.keys(nodeAny.fval).length === 0) {
                     return '0.0';
                 }
                 else {
-                    return nodeAny.fval.toString();
+                    return formatNumeric(nodeAny.fval);
                 }
             }
             else if (nodeAny.fval === null) {
                 return 'NULL';
             }
             else {
-                return nodeAny.fval.toString();
+                return formatNumeric(nodeAny.fval);
             }
         }
         else if (nodeAny.sval !== undefined) {
@@ -1478,15 +1686,7 @@ export class Deparser {
         else if (nodeAny.bsval !== undefined) {
             if (typeof nodeAny.bsval === 'object' && nodeAny.bsval !== null) {
                 if (nodeAny.bsval.bsval !== undefined) {
-                    const bsval = nodeAny.bsval.bsval;
-                    // Check if this is a hexadecimal bit string (starts with x and contains only hex digits)
-                    if (bsval.startsWith('x') && /^x[0-9A-Fa-f]+$/.test(bsval)) {
-                        return `x'${bsval.substring(1)}'`;
-                    }
-                    if (bsval.startsWith('b')) {
-                        return `b'${bsval.substring(1)}'`;
-                    }
-                    return `b'${bsval}'`;
+                    return formatBitString(nodeAny.bsval.bsval);
                 }
                 else if (Object.keys(nodeAny.bsval).length === 0) {
                     return "''";
@@ -1499,23 +1699,15 @@ export class Deparser {
                 return 'NULL';
             }
             else {
-                const bsval = nodeAny.bsval;
-                // Check if this is a hexadecimal bit string (starts with x and contains only hex digits)
-                if (bsval.startsWith('x') && /^x[0-9A-Fa-f]+$/.test(bsval)) {
-                    return `x'${bsval.substring(1)}'`;
-                }
-                if (bsval.startsWith('b')) {
-                    return `b'${bsval.substring(1)}'`;
-                }
-                return `b'${bsval}'`;
+                return formatBitString(nodeAny.bsval);
             }
         }
         if (nodeAny.val) {
             if (nodeAny.val.Integer?.ival !== undefined) {
-                return nodeAny.val.Integer.ival.toString();
+                return formatInteger(nodeAny.val.Integer.ival);
             }
             else if (nodeAny.val.Float?.fval !== undefined) {
-                return nodeAny.val.Float.fval.toString();
+                return formatNumeric(nodeAny.val.Float.fval);
             }
             else if (nodeAny.val.String?.sval !== undefined) {
                 return QuoteUtils.escape(nodeAny.val.String.sval);
@@ -1524,7 +1716,7 @@ export class Deparser {
                 return nodeAny.val.Boolean.boolval ? 'true' : 'false';
             }
             else if (nodeAny.val.BitString?.bsval !== undefined) {
-                return nodeAny.val.BitString.bsval;
+                return formatBitString(nodeAny.val.BitString.bsval);
             }
         }
         if (nodeAny.isnull === true) {
@@ -1536,15 +1728,15 @@ export class Deparser {
             }
             if (nodeAny.Integer !== undefined) {
                 if (typeof nodeAny.Integer === 'object' && nodeAny.Integer.ival !== undefined) {
-                    return nodeAny.Integer.ival.toString();
+                    return formatInteger(nodeAny.Integer.ival);
                 }
-                return nodeAny.Integer.toString();
+                return formatInteger(nodeAny.Integer);
             }
             if (nodeAny.Float !== undefined) {
                 if (typeof nodeAny.Float === 'object' && nodeAny.Float.fval !== undefined) {
-                    return nodeAny.Float.fval.toString();
+                    return formatNumeric(nodeAny.Float.fval);
                 }
-                return nodeAny.Float.toString();
+                return formatNumeric(nodeAny.Float);
             }
             if (nodeAny.String !== undefined) {
                 if (typeof nodeAny.String === 'object' && nodeAny.String.sval !== undefined) {
@@ -1564,7 +1756,7 @@ export class Deparser {
         const fields = ListUtils.unwrapList(node.fields);
         return fields.map(field => {
             if (field.String) {
-                return QuoteUtils.quote(field.String.sval || field.String.str);
+                return QuoteUtils.quoteIdentifier(field.String.sval || field.String.str);
             }
             else if (field.A_Star) {
                 return '*';
@@ -1641,8 +1833,7 @@ export class Deparser {
                 }
                 return output.join(' ');
             }
-            const quotedTypeName = QuoteUtils.quote(typeName);
-            let result = mods(quotedTypeName, args);
+            let result = mods(QuoteUtils.quoteIdentifierTypeName(typeName), args);
             if (node.arrayBounds && node.arrayBounds.length > 0) {
                 result += formatArrayBounds(node.arrayBounds);
             }
@@ -1738,8 +1929,9 @@ export class Deparser {
                 return output.join(' ');
             }
         }
-        const quotedNames = names.map((name) => QuoteUtils.quote(name));
-        let result = mods(quotedNames.join('.'), args);
+        // Use type-name quoting for non-pg_catalog types
+        // This allows keywords like 'json', 'int', 'boolean' to remain unquoted in type positions
+        let result = mods(QuoteUtils.quoteTypeDottedName(names), args);
         if (node.arrayBounds && node.arrayBounds.length > 0) {
             result += formatArrayBounds(node.arrayBounds);
         }
@@ -1777,17 +1969,17 @@ export class Deparser {
         }
         let tableName = '';
         if (node.catalogname) {
-            tableName = QuoteUtils.quote(node.catalogname);
+            tableName = QuoteUtils.quoteIdentifier(node.catalogname);
             if (node.schemaname) {
-                tableName += '.' + QuoteUtils.quote(node.schemaname);
+                tableName += '.' + QuoteUtils.quoteIdentifierAfterDot(node.schemaname);
             }
-            tableName += '.' + QuoteUtils.quote(node.relname);
+            tableName += '.' + QuoteUtils.quoteIdentifierAfterDot(node.relname);
         }
         else if (node.schemaname) {
-            tableName = QuoteUtils.quote(node.schemaname) + '.' + QuoteUtils.quote(node.relname);
+            tableName = QuoteUtils.quoteQualifiedIdentifier(node.schemaname, node.relname);
         }
         else {
-            tableName = QuoteUtils.quote(node.relname);
+            tableName = QuoteUtils.quoteIdentifier(node.relname);
         }
         output.push(tableName);
         if (node.alias) {
@@ -1941,7 +2133,7 @@ export class Deparser {
                 if (size != null) {
                     return 'char';
                 }
-                return 'pg_catalog.bpchar';
+                return 'bpchar';
             case 'varchar':
                 return 'varchar';
             case 'numeric':
@@ -1955,7 +2147,7 @@ export class Deparser {
             case 'int8':
                 return 'bigint';
             case 'real':
-                return 'pg_catalog.float4';
+                return 'float4';
             case 'time':
                 return 'time';
             case 'timestamp':
@@ -1965,7 +2157,7 @@ export class Deparser {
             case 'bit':
                 return 'bit';
             default:
-                return `pg_catalog.${typeName}`;
+                return typeName;
         }
     }
     isPgCatalogType(typeName) {
@@ -2006,14 +2198,16 @@ export class Deparser {
     A_Indirection(node, context) {
         let argStr = this.visit(node.arg, context);
         const argType = this.getNodeType(node.arg);
-        if (argType === 'TypeCast' || argType === 'SubLink' || argType === 'A_Expr' || argType === 'FuncCall' || argType === 'A_Indirection' || argType === 'ColumnRef' || argType === 'RowExpr') {
+        // Grammar: only a parameter takes indirection bare; every other target is
+        // `'(' a_expr ')' opt_indirection` (a plain column subscript is the same node).
+        if (argType !== 'ParamRef') {
             argStr = `(${argStr})`;
         }
         const output = [argStr];
         const indirection = ListUtils.unwrapList(node.indirection);
         for (const subnode of indirection) {
             if (subnode.String || subnode.A_Star) {
-                const value = subnode.A_Star ? '*' : QuoteUtils.quote(subnode.String.sval || subnode.String.str);
+                const value = subnode.A_Star ? '*' : QuoteUtils.quoteIdentifier(subnode.String.sval || subnode.String.str);
                 output.push(`.${value}`);
             }
             else {
@@ -2034,21 +2228,11 @@ export class Deparser {
         if (context.isPretty() && args.length > 0) {
             for (const arg of args) {
                 const whenClause = this.visit(arg, context);
-                if (this.containsMultilineStringLiteral(whenClause)) {
-                    output.push(context.newline() + whenClause);
-                }
-                else {
-                    output.push(context.newline() + context.indent(whenClause));
-                }
+                output.push(context.newline() + context.indent(whenClause));
             }
             if (node.defresult) {
                 const elseResult = this.visit(node.defresult, context);
-                if (this.containsMultilineStringLiteral(elseResult)) {
-                    output.push(context.newline() + 'ELSE ' + elseResult);
-                }
-                else {
-                    output.push(context.newline() + context.indent('ELSE ' + elseResult));
-                }
+                output.push(context.newline() + context.indent('ELSE ' + elseResult));
             }
             output.push(context.newline() + 'END');
             return output.join(' ');
@@ -2089,10 +2273,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}`;
                 }
             }
@@ -2155,45 +2342,21 @@ export class Deparser {
         }
         return output.join(' ');
     }
-    static RESERVED_WORDS = new Set([
-        'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both',
-        'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog',
-        'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user',
-        'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false',
-        'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially',
-        'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp',
-        'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary',
-        'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table',
-        'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic',
-        'when', 'where', 'window', 'with'
-    ]);
-    static needsQuotes(value) {
-        if (!value)
-            return false;
-        const needsQuotesRegex = /[a-z]+[\W\w]*[A-Z]+|[A-Z]+[\W\w]*[a-z]+|\W/;
-        const isAllUppercase = /^[A-Z]+$/.test(value);
-        return needsQuotesRegex.test(value) ||
-            Deparser.RESERVED_WORDS.has(value.toLowerCase()) ||
-            isAllUppercase;
-    }
     quoteIfNeeded(value) {
-        if (Deparser.needsQuotes(value)) {
-            return `"${value}"`;
-        }
-        return value;
+        return QuoteUtils.quoteIdentifier(value);
     }
     preserveOperatorDefElemCase(defName) {
         const caseMap = {
-            'leftarg': 'Leftarg',
-            'rightarg': 'Rightarg',
-            'procedure': 'Procedure',
-            'function': 'Function',
-            'commutator': 'Commutator',
-            'negator': 'Negator',
-            'restrict': 'Restrict',
-            'join': 'Join',
-            'hashes': 'Hashes',
-            'merges': 'Merges'
+            leftarg: 'Leftarg',
+            rightarg: 'Rightarg',
+            procedure: 'Procedure',
+            function: 'Function',
+            commutator: 'Commutator',
+            negator: 'Negator',
+            restrict: 'Restrict',
+            join: 'Join',
+            hashes: 'Hashes',
+            merges: 'Merges'
         };
         return caseMap[defName.toLowerCase()] || defName;
     }
@@ -2213,27 +2376,19 @@ export class Deparser {
                 return value; // Don't quote pure operator symbols like "=" or "-"
             }
         }
-        return Deparser.needsQuotes(value) ? `"${value}"` : value;
+        return QuoteUtils.quoteIdentifier(value);
     }
     Integer(node, context) {
-        return node.ival?.toString() || '0';
+        return node.ival === undefined || node.ival === null ? '0' : formatInteger(node.ival);
     }
     Float(node, context) {
-        return node.fval || '0.0';
+        return node.fval ? formatNumeric(node.fval) : '0.0';
     }
     Boolean(node, context) {
         return node.boolval ? 'true' : 'false';
     }
     BitString(node, context) {
-        // Check if this is a hexadecimal bit string (starts with x)
-        if (node.bsval.startsWith('x')) {
-            return `x'${node.bsval.substring(1)}'`;
-        }
-        if (node.bsval.startsWith('b')) {
-            return `b'${node.bsval.substring(1)}'`;
-        }
-        // Fallback for raw values without prefix
-        return `b'${node.bsval}'`;
+        return formatBitString(node.bsval);
     }
     Null(node, context) {
         return 'NULL';
@@ -2272,7 +2427,7 @@ export class Deparser {
                 output.push(context.parens(elementStrs.join(', ')));
             }
         }
-        else if (node.tableElts) {
+        else if (node.tableElts && !node.partbound) {
             const elements = ListUtils.unwrapList(node.tableElts);
             const elementStrs = elements.map(el => {
                 return this.deparse(el, context.spawn('CreateStmt'));
@@ -2300,7 +2455,16 @@ export class Deparser {
             const inherits = ListUtils.unwrapList(node.inhRelations);
             const inheritStrs = inherits.map(rel => this.visit(rel, context));
             output.push(inheritStrs[0]);
-            if (node.partbound.strategy === 'l' && node.partbound.listdatums) {
+            if (node.tableElts) {
+                const elementStrs = ListUtils.unwrapList(node.tableElts).map(el => {
+                    return this.deparse(el, context.spawn('CreateStmt'));
+                });
+                output.push(context.parens(elementStrs.join(', ')));
+            }
+            if (node.partbound.is_default) {
+                output.push('DEFAULT');
+            }
+            else if (node.partbound.strategy === 'l' && node.partbound.listdatums) {
                 output.push('FOR VALUES IN');
                 const listValues = ListUtils.unwrapList(node.partbound.listdatums)
                     .map(datum => this.visit(datum, context))
@@ -2323,13 +2487,9 @@ export class Deparser {
                     output.push(`(${upperValues})`);
                 }
             }
-            else if (node.partbound.strategy === 'h' && node.partbound.modulus !== undefined) {
+            else if (node.partbound.strategy === 'h') {
                 output.push('FOR VALUES WITH');
-                const remainder = node.partbound.remainder !== undefined ? node.partbound.remainder : 0;
-                output.push(`(MODULUS ${node.partbound.modulus}, REMAINDER ${remainder})`);
-            }
-            else if (node.partbound.is_default) {
-                output.push('DEFAULT');
+                output.push(`(MODULUS ${node.partbound.modulus ?? 0}, REMAINDER ${node.partbound.remainder ?? 0})`);
             }
         }
         else if (node.inhRelations) {
@@ -2390,11 +2550,17 @@ export class Deparser {
     ColumnDef(node, context) {
         const output = [];
         if (node.colname) {
-            output.push(QuoteUtils.quote(node.colname));
+            output.push(QuoteUtils.quoteIdentifier(node.colname));
         }
         if (node.typeName) {
             output.push(this.TypeName(node.typeName, context));
         }
+        if (node.storage_name) {
+            output.push('STORAGE', node.storage_name.toUpperCase());
+        }
+        if (node.compression) {
+            output.push('COMPRESSION', QuoteUtils.quoteIdentifier(node.compression));
+        }
         if (node.fdwoptions && node.fdwoptions.length > 0) {
             output.push('OPTIONS');
             const columnContext = context.spawn('ColumnDef');
@@ -2429,9 +2595,9 @@ export class Deparser {
     Constraint(node, context) {
         const output = [];
         // Handle constraint name if present
-        if (node.conname && (node.contype === 'CONSTR_CHECK' || node.contype === 'CONSTR_UNIQUE' || node.contype === 'CONSTR_PRIMARY' || node.contype === 'CONSTR_FOREIGN')) {
+        if (node.conname && (node.contype === 'CONSTR_CHECK' || node.contype === 'CONSTR_UNIQUE' || node.contype === 'CONSTR_PRIMARY' || node.contype === 'CONSTR_FOREIGN' || node.contype === 'CONSTR_NOTNULL' || node.contype === 'CONSTR_EXCLUSION')) {
             output.push('CONSTRAINT');
-            output.push(QuoteUtils.quote(node.conname));
+            output.push(QuoteUtils.quoteIdentifier(node.conname));
         }
         switch (node.contype) {
             case 'CONSTR_NULL':
@@ -2439,11 +2605,24 @@ export class Deparser {
                 break;
             case 'CONSTR_NOTNULL':
                 output.push('NOT NULL');
+                if (node.keys && node.keys.length > 0 && !context.isColumnConstraint) {
+                    const keyList = ListUtils.unwrapList(node.keys)
+                        .map(key => this.visit(key, context))
+                        .join(', ');
+                    output.push(keyList);
+                }
+                if (node.is_no_inherit) {
+                    output.push('NO INHERIT');
+                }
+                if (node.skip_validation) {
+                    output.push('NOT VALID');
+                }
                 break;
             case 'CONSTR_DEFAULT':
                 output.push('DEFAULT');
                 if (node.raw_expr) {
-                    output.push(this.visit(node.raw_expr, context));
+                    const defaultExpr = this.visit(node.raw_expr, context);
+                    output.push(this.needsBExprParens(node.raw_expr) ? `(${defaultExpr})` : defaultExpr);
                 }
                 break;
             case 'CONSTR_CHECK':
@@ -2467,8 +2646,13 @@ export class Deparser {
                         output.push(context.parens(this.visit(node.raw_expr, context)));
                     }
                 }
-                // Handle NOT VALID for check constraints
-                if (node.skip_validation) {
+                // PG18: constraints are enforced unless explicitly NOT ENFORCED
+                // (libpg-query omits false booleans, so undefined means not enforced)
+                if (node.is_enforced !== true && !context.isDomainConstraint) {
+                    output.push('NOT ENFORCED');
+                }
+                else if (node.skip_validation) {
+                    // NOT ENFORCED implies NOT VALID, so only emit NOT VALID when enforced
                     output.push('NOT VALID');
                 }
                 // Handle NO INHERIT for check constraints - only for table constraints, not domain constraints
@@ -2488,7 +2672,7 @@ export class Deparser {
                 if (node.raw_expr) {
                     output.push(context.parens(this.visit(node.raw_expr, context)));
                 }
-                output.push('STORED');
+                output.push(node.generated_kind === 'v' ? 'VIRTUAL' : 'STORED');
                 break;
             case 'CONSTR_IDENTITY':
                 output.push('GENERATED');
@@ -2564,10 +2748,12 @@ export class Deparser {
             case 'CONSTR_PRIMARY':
                 output.push('PRIMARY KEY');
                 if (node.keys && node.keys.length > 0) {
-                    const keyList = ListUtils.unwrapList(node.keys)
-                        .map(key => this.visit(key, context))
-                        .join(', ');
-                    output.push(`(${keyList})`);
+                    const keyItems = ListUtils.unwrapList(node.keys)
+                        .map(key => this.visit(key, context));
+                    if (node.without_overlaps) {
+                        keyItems[keyItems.length - 1] += ' WITHOUT OVERLAPS';
+                    }
+                    output.push(`(${keyItems.join(', ')})`);
                 }
                 if (node.indexname) {
                     output.push('USING INDEX');
@@ -2585,10 +2771,12 @@ export class Deparser {
                     output.push('NULLS NOT DISTINCT');
                 }
                 if (node.keys && node.keys.length > 0) {
-                    const keyList = ListUtils.unwrapList(node.keys)
-                        .map(key => this.visit(key, context))
-                        .join(', ');
-                    output.push(`(${keyList})`);
+                    const keyItems = ListUtils.unwrapList(node.keys)
+                        .map(key => this.visit(key, context));
+                    if (node.without_overlaps) {
+                        keyItems[keyItems.length - 1] += ' WITHOUT OVERLAPS';
+                    }
+                    output.push(`(${keyItems.join(', ')})`);
                 }
                 if (node.indexname) {
                     output.push('USING INDEX');
@@ -2601,20 +2789,14 @@ export class Deparser {
                     if (context.isPretty()) {
                         output.push('\n' + context.indent('FOREIGN KEY'));
                         if (node.fk_attrs && node.fk_attrs.length > 0) {
-                            const fkAttrs = ListUtils.unwrapList(node.fk_attrs)
-                                .map(attr => this.visit(attr, context))
-                                .join(', ');
-                            output.push(`(${fkAttrs})`);
+                            output.push(`(${this.deparseKeyAttrs(node.fk_attrs, node.fk_with_period, context)})`);
                         }
                         output.push('\n' + context.indent('REFERENCES'));
                     }
                     else {
                         output.push('FOREIGN KEY');
                         if (node.fk_attrs && node.fk_attrs.length > 0) {
-                            const fkAttrs = ListUtils.unwrapList(node.fk_attrs)
-                                .map(attr => this.visit(attr, context))
-                                .join(', ');
-                            output.push(`(${fkAttrs})`);
+                            output.push(`(${this.deparseKeyAttrs(node.fk_attrs, node.fk_with_period, context)})`);
                         }
                         output.push('REFERENCES');
                     }
@@ -2637,9 +2819,7 @@ export class Deparser {
                     }
                 }
                 if (node.pk_attrs && node.pk_attrs.length > 0) {
-                    const pkAttrs = ListUtils.unwrapList(node.pk_attrs)
-                        .map(attr => this.visit(attr, context))
-                        .join(', ');
+                    const pkAttrs = this.deparseKeyAttrs(node.pk_attrs, node.pk_with_period, context);
                     if (context.isPretty() && !context.isColumnConstraint) {
                         const lastIndex = output.length - 1;
                         if (lastIndex >= 0) {
@@ -2710,6 +2890,15 @@ export class Deparser {
                             deleteClause += 'SET DEFAULT';
                             break;
                     }
+                    if ((node.fk_del_action === 'n' || node.fk_del_action === 'd') && node.fk_del_set_cols && node.fk_del_set_cols.length > 0) {
+                        const setColumns = ListUtils.unwrapList(node.fk_del_set_cols)
+                            .map(column => {
+                            const stringNode = column.String;
+                            return QuoteUtils.quoteIdentifier(stringNode.sval || stringNode.str || '');
+                        })
+                            .join(', ');
+                        deleteClause += ` (${setColumns})`;
+                    }
                     if (context.isPretty()) {
                         output.push('\n' + context.indent(deleteClause));
                     }
@@ -2718,8 +2907,18 @@ export class Deparser {
                         output.push(deleteClause.replace('ON DELETE ', ''));
                     }
                 }
-                // Handle NOT VALID for foreign key constraints - only for table constraints, not domain constraints
-                if (node.skip_validation && !context.isDomainConstraint) {
+                // PG18: constraints are enforced unless explicitly NOT ENFORCED
+                // (libpg-query omits false booleans, so undefined means not enforced)
+                if (node.is_enforced !== true && !context.isDomainConstraint) {
+                    if (context.isPretty() && !context.isColumnConstraint) {
+                        output.push('\n' + context.indent('NOT ENFORCED'));
+                    }
+                    else {
+                        output.push('NOT ENFORCED');
+                    }
+                }
+                else if (node.skip_validation && !context.isDomainConstraint) {
+                    // NOT ENFORCED implies NOT VALID, so only emit NOT VALID when enforced
                     if (context.isPretty() && !context.isColumnConstraint) {
                         output.push('\n' + context.indent('NOT VALID'));
                     }
@@ -2740,6 +2939,12 @@ export class Deparser {
             case 'CONSTR_ATTR_IMMEDIATE':
                 output.push('INITIALLY IMMEDIATE');
                 break;
+            case 'CONSTR_ATTR_ENFORCED':
+                output.push('ENFORCED');
+                break;
+            case 'CONSTR_ATTR_NOT_ENFORCED':
+                output.push('NOT ENFORCED');
+                break;
             case 'CONSTR_EXCLUSION':
                 output.push('EXCLUDE');
                 if (node.access_method) {
@@ -2774,10 +2979,14 @@ export class Deparser {
                     });
                     output.push(`(${exclusionElements.join(', ')})`);
                 }
+                if (node.where_clause) {
+                    output.push('WHERE');
+                    output.push(context.parens(this.visit(node.where_clause, context)));
+                }
                 break;
         }
         // Handle deferrable constraints for all constraint types that support it
-        if (node.contype === 'CONSTR_PRIMARY' || node.contype === 'CONSTR_UNIQUE' || node.contype === 'CONSTR_FOREIGN') {
+        if (node.contype === 'CONSTR_PRIMARY' || node.contype === 'CONSTR_UNIQUE' || node.contype === 'CONSTR_FOREIGN' || node.contype === 'CONSTR_EXCLUSION') {
             if (node.deferrable) {
                 if (context.isPretty() && node.contype === 'CONSTR_FOREIGN') {
                     output.push('\n' + context.indent('DEFERRABLE'));
@@ -2806,6 +3015,9 @@ export class Deparser {
                     output.push('NOT DEFERRABLE');
                 }
             }
+            else if (node.initdeferred) {
+                output.push('INITIALLY DEFERRED');
+            }
         }
         if (context.isPretty() && node.contype === 'CONSTR_FOREIGN') {
             let result = '';
@@ -2871,6 +3083,9 @@ export class Deparser {
             output.push(node.name);
         }
         const windowParts = [];
+        if (node.refname) {
+            windowParts.push(node.refname);
+        }
         if (node.partitionClause) {
             const partitions = ListUtils.unwrapList(node.partitionClause);
             const partitionStrs = partitions.map(p => this.visit(p, context));
@@ -2881,12 +3096,9 @@ export class Deparser {
             const orderStrs = orders.map(o => this.visit(o, context));
             windowParts.push(`ORDER BY ${orderStrs.join(', ')}`);
         }
-        // Only add frame clause if frameOptions indicates non-default framing
-        if (node.frameOptions && node.frameOptions !== 1058) {
-            const frameClause = this.formatWindowFrame(node, context.spawn('WindowDef'));
-            if (frameClause) {
-                windowParts.push(frameClause);
-            }
+        const frameClause = this.formatWindowFrame(node, context.spawn('WindowDef'));
+        if (frameClause) {
+            windowParts.push(frameClause);
         }
         if (windowParts.length > 0) {
             if (node.name) {
@@ -2903,103 +3115,97 @@ export class Deparser {
         }
         return output.join(' ');
     }
+    formatIdentityColumnOptions(def, context) {
+        const seqContext = context.spawn('AlterSeqStmt');
+        return ListUtils.unwrapList(def).map(item => {
+            const el = item.DefElem;
+            if (!el)
+                return this.visit(item, context);
+            if (el.defname === 'generated') {
+                const ival = el.arg?.Integer?.ival ?? 0;
+                return ival === 97 ? 'SET GENERATED ALWAYS' : 'SET GENERATED BY DEFAULT';
+            }
+            if (el.defname === 'restart') {
+                return el.arg ? `RESTART WITH ${this.visit(el.arg, context)}` : 'RESTART';
+            }
+            return `SET ${this.visit(item, seqContext)}`;
+        }).join(' ');
+    }
+    // b_expr (used by DEFAULT) excludes IN/LIKE/BETWEEN and boolean operators.
+    needsBExprParens(node) {
+        const nodeType = this.getNodeType(node);
+        if (nodeType === 'BoolExpr')
+            return true;
+        if (nodeType === 'A_Expr') {
+            const kind = this.getNodeData(node).kind;
+            return kind !== 'AEXPR_OP' && kind !== 'AEXPR_DISTINCT' && kind !== 'AEXPR_NOT_DISTINCT';
+        }
+        return false;
+    }
     formatWindowFrame(node, context) {
-        if (!node.frameOptions)
+        if (!node.frameOptions || !(node.frameOptions & FRAMEOPTION_NONDEFAULT))
             return null;
         const frameOptions = node.frameOptions;
         const frameParts = [];
-        if (frameOptions & 0x01) { // FRAMEOPTION_NONDEFAULT
-            if (frameOptions & 0x02) { // FRAMEOPTION_RANGE
-                frameParts.push('RANGE');
-            }
-            else if (frameOptions & 0x04) { // FRAMEOPTION_ROWS
-                frameParts.push('ROWS');
-            }
-            else if (frameOptions & 0x08) { // FRAMEOPTION_GROUPS
-                frameParts.push('GROUPS');
-            }
+        if (frameOptions & FRAMEOPTION_RANGE) {
+            frameParts.push('RANGE');
+        }
+        else if (frameOptions & FRAMEOPTION_ROWS) {
+            frameParts.push('ROWS');
+        }
+        else if (frameOptions & FRAMEOPTION_GROUPS) {
+            frameParts.push('GROUPS');
         }
         if (frameParts.length === 0)
             return null;
-        const boundsParts = [];
-        // Handle specific frameOptions values that have known mappings
-        if (frameOptions === 789) {
-            boundsParts.push('CURRENT ROW');
-            boundsParts.push('AND UNBOUNDED FOLLOWING');
+        let start = null;
+        if (frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING) {
+            start = 'UNBOUNDED PRECEDING';
         }
-        else if (frameOptions === 1077) {
-            boundsParts.push('UNBOUNDED PRECEDING');
-            boundsParts.push('AND CURRENT ROW');
+        else if (frameOptions & FRAMEOPTION_START_UNBOUNDED_FOLLOWING) {
+            start = 'UNBOUNDED FOLLOWING';
         }
-        else if (frameOptions === 18453) {
-            if (node.startOffset && node.endOffset) {
-                boundsParts.push(`${this.visit(node.startOffset, context)} PRECEDING`);
-                boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
-            }
+        else if (frameOptions & FRAMEOPTION_START_CURRENT_ROW) {
+            start = 'CURRENT ROW';
         }
-        else if (frameOptions === 1557) {
-            boundsParts.push('CURRENT ROW');
-            boundsParts.push('AND CURRENT ROW');
+        else if (frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING && node.startOffset) {
+            start = `${this.visit(node.startOffset, context)} PRECEDING`;
         }
-        else if (frameOptions === 16917) {
-            boundsParts.push('CURRENT ROW');
-            if (node.endOffset) {
-                boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
-            }
+        else if (frameOptions & FRAMEOPTION_START_OFFSET_FOLLOWING && node.startOffset) {
+            start = `${this.visit(node.startOffset, context)} FOLLOWING`;
         }
-        else if (frameOptions === 1058) {
-            return null;
+        let end = null;
+        if (frameOptions & FRAMEOPTION_END_UNBOUNDED_PRECEDING) {
+            end = 'UNBOUNDED PRECEDING';
         }
-        else {
-            // Handle start bound - prioritize explicit offset values over bit flags
-            if (node.startOffset) {
-                if (frameOptions & 0x400) { // FRAMEOPTION_START_VALUE_PRECEDING
-                    boundsParts.push(`${this.visit(node.startOffset, context)} PRECEDING`);
-                }
-                else if (frameOptions & 0x800) { // FRAMEOPTION_START_VALUE_FOLLOWING
-                    boundsParts.push(`${this.visit(node.startOffset, context)} FOLLOWING`);
-                }
-                else {
-                    boundsParts.push(`${this.visit(node.startOffset, context)} PRECEDING`);
-                }
-            }
-            else if (frameOptions & 0x10) { // FRAMEOPTION_START_UNBOUNDED_PRECEDING
-                boundsParts.push('UNBOUNDED PRECEDING');
-            }
-            else if (frameOptions & 0x20) { // FRAMEOPTION_START_CURRENT_ROW
-                boundsParts.push('CURRENT ROW');
-            }
-            // Handle end bound - prioritize explicit offset values over bit flags
-            if (node.endOffset) {
-                if (boundsParts.length > 0) {
-                    if (frameOptions & 0x1000) { // FRAMEOPTION_END_VALUE_PRECEDING
-                        boundsParts.push(`AND ${this.visit(node.endOffset, context)} PRECEDING`);
-                    }
-                    else if (frameOptions & 0x2000) { // FRAMEOPTION_END_VALUE_FOLLOWING
-                        boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
-                    }
-                    else {
-                        boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
-                    }
-                }
-            }
-            else if (frameOptions & 0x80) { // FRAMEOPTION_END_UNBOUNDED_FOLLOWING
-                if (boundsParts.length > 0) {
-                    boundsParts.push('AND UNBOUNDED FOLLOWING');
-                }
-            }
-            else if (frameOptions & 0x100) { // FRAMEOPTION_END_CURRENT_ROW
-                if (boundsParts.length > 0) {
-                    boundsParts.push('AND CURRENT ROW');
-                }
+        else if (frameOptions & FRAMEOPTION_END_UNBOUNDED_FOLLOWING) {
+            end = 'UNBOUNDED FOLLOWING';
+        }
+        else if (frameOptions & FRAMEOPTION_END_CURRENT_ROW) {
+            end = 'CURRENT ROW';
+        }
+        else if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING && node.endOffset) {
+            end = `${this.visit(node.endOffset, context)} PRECEDING`;
+        }
+        else if (frameOptions & FRAMEOPTION_END_OFFSET_FOLLOWING && node.endOffset) {
+            end = `${this.visit(node.endOffset, context)} FOLLOWING`;
+        }
+        if (start) {
+            if (frameOptions & FRAMEOPTION_BETWEEN) {
+                frameParts.push(`BETWEEN ${start} AND ${end ?? 'CURRENT ROW'}`);
             }
-            else if (boundsParts.length > 0) {
-                boundsParts.push('AND CURRENT ROW');
+            else {
+                frameParts.push(start);
             }
         }
-        if (boundsParts.length > 0) {
-            frameParts.push('BETWEEN');
-            frameParts.push(boundsParts.join(' '));
+        if (frameOptions & FRAMEOPTION_EXCLUDE_CURRENT_ROW) {
+            frameParts.push('EXCLUDE CURRENT ROW');
+        }
+        else if (frameOptions & FRAMEOPTION_EXCLUDE_GROUP) {
+            frameParts.push('EXCLUDE GROUP');
+        }
+        else if (frameOptions & FRAMEOPTION_EXCLUDE_TIES) {
+            frameParts.push('EXCLUDE TIES');
         }
         return frameParts.join(' ');
     }
@@ -3077,8 +3283,35 @@ export class Deparser {
         if (node.ctequery) {
             output.push(context.parens(this.visit(node.ctequery, context)));
         }
+        if (node.search_clause) {
+            const sc = node.search_clause;
+            const cols = ListUtils.unwrapList(sc.search_col_list).map(c => this.visit(c, context));
+            output.push('SEARCH', sc.search_breadth_first ? 'BREADTH' : 'DEPTH', 'FIRST BY');
+            output.push(cols.join(', '));
+            output.push('SET', QuoteUtils.quoteIdentifier(sc.search_seq_column));
+        }
+        if (node.cycle_clause) {
+            const cc = node.cycle_clause;
+            const cols = ListUtils.unwrapList(cc.cycle_col_list).map(c => this.visit(c, context));
+            output.push('CYCLE', cols.join(', '));
+            output.push('SET', QuoteUtils.quoteIdentifier(cc.cycle_mark_column));
+            if (cc.cycle_mark_value && cc.cycle_mark_default) {
+                output.push('TO', this.formatAexprConst(cc.cycle_mark_value, context));
+                output.push('DEFAULT', this.formatAexprConst(cc.cycle_mark_default, context));
+            }
+            output.push('USING', QuoteUtils.quoteIdentifier(cc.cycle_path_column));
+        }
         return output.join(' ');
     }
+    // Renders a constant in the restricted AexprConst grammar (e.g. `point '(1,1)'`
+    // rather than `CAST('(1,1)' AS point)`).
+    formatAexprConst(node, context) {
+        const cast = node.TypeCast;
+        if (cast?.arg?.A_Const?.sval && cast.typeName) {
+            return `${this.TypeName(cast.typeName, context)} ${this.visit(cast.arg, context)}`;
+        }
+        return this.visit(node, context);
+    }
     ParamRef(node, context) {
         return `$${node.number}`;
     }
@@ -3328,7 +3561,7 @@ export class Deparser {
             output.push('IF NOT EXISTS');
         }
         if (node.idxname) {
-            output.push(QuoteUtils.quote(node.idxname));
+            output.push(QuoteUtils.quoteIdentifier(node.idxname));
         }
         output.push('ON');
         if (node.relation) {
@@ -3347,9 +3580,8 @@ export class Deparser {
             output.push('INCLUDE');
             output.push(context.parens(includeStrs.join(', ')));
         }
-        if (node.whereClause) {
-            output.push('WHERE');
-            output.push(this.visit(node.whereClause, context));
+        if (node.nulls_not_distinct) {
+            output.push('NULLS NOT DISTINCT');
         }
         if (node.options && node.options.length > 0) {
             const indexContext = context.spawn('IndexStmt');
@@ -3357,19 +3589,20 @@ export class Deparser {
             output.push('WITH');
             output.push(context.parens(optionStrs.join(', ')));
         }
-        if (node.nulls_not_distinct) {
-            output.push('NULLS NOT DISTINCT');
-        }
         if (node.tableSpace) {
             output.push('TABLESPACE');
-            output.push(QuoteUtils.quote(node.tableSpace));
+            output.push(QuoteUtils.quoteIdentifier(node.tableSpace));
         }
-        return output.join(' ');
-    }
+        if (node.whereClause) {
+            output.push('WHERE');
+            output.push(this.visit(node.whereClause, context));
+        }
+        return output.join(' ');
+    }
     IndexElem(node, context) {
         const output = [];
         if (node.name) {
-            output.push(QuoteUtils.quote(node.name));
+            output.push(QuoteUtils.quoteIdentifier(node.name));
         }
         else if (node.expr) {
             output.push(context.parens(this.visit(node.expr, context)));
@@ -3387,7 +3620,7 @@ export class Deparser {
                 const opclassOpts = ListUtils.unwrapList(node.opclassopts).map(opt => {
                     if (opt.DefElem && opt.DefElem.arg && this.getNodeType(opt.DefElem.arg) === 'String') {
                         const stringData = this.getNodeData(opt.DefElem.arg);
-                        return `${opt.DefElem.defname}='${stringData.sval}'`;
+                        return `${QuoteUtils.quoteIdentifierAfterDot(opt.DefElem.defname)}=${QuoteUtils.escape(stringData.sval)}`;
                     }
                     return this.visit(opt, context.spawn('IndexElem'));
                 });
@@ -3420,7 +3653,7 @@ export class Deparser {
     PartitionElem(node, context) {
         const output = [];
         if (node.name) {
-            output.push(QuoteUtils.quote(node.name));
+            output.push(QuoteUtils.quoteIdentifier(node.name));
         }
         else if (node.expr) {
             output.push(context.parens(this.visit(node.expr, context)));
@@ -3438,12 +3671,12 @@ export class Deparser {
     }
     PartitionCmd(node, context) {
         const output = [];
+        if (node.name) {
+            output.push(this.RangeVar(node.name, context));
+        }
         if (node.concurrent) {
             output.push('CONCURRENTLY');
         }
-        if (node.name) {
-            output.push(this.visit(node.name, context));
-        }
         if (node.bound) {
             if (node.bound.strategy === 'l' && node.bound.listdatums) {
                 output.push('FOR VALUES IN');
@@ -3468,9 +3701,9 @@ export class Deparser {
                     output.push(`(${upperValues})`);
                 }
             }
-            else if (node.bound.strategy === 'h' && node.bound.modulus !== undefined && node.bound.remainder !== undefined) {
+            else if (node.bound.strategy === 'h') {
                 output.push('FOR VALUES WITH');
-                output.push(`(modulus ${node.bound.modulus}, remainder ${node.bound.remainder})`);
+                output.push(`(MODULUS ${node.bound.modulus ?? 0}, REMAINDER ${node.bound.remainder ?? 0})`);
             }
             else if (node.bound.is_default) {
                 output.push('DEFAULT');
@@ -3601,12 +3834,7 @@ export class Deparser {
             if (context.isPretty()) {
                 // For complex JOIN conditions, format with proper indentation
                 if (qualsStr.includes('AND') || qualsStr.includes('OR') || qualsStr.length > 50) {
-                    if (this.containsMultilineStringLiteral(qualsStr)) {
-                        output.push(` ON ${qualsStr}`);
-                    }
-                    else {
-                        output.push(` ON${context.newline()}${context.indent(qualsStr)}`);
-                    }
+                    output.push(` ON${context.newline()}${context.indent(qualsStr)}`);
                 }
                 else {
                     output.push(` ON ${qualsStr}`);
@@ -3670,37 +3898,37 @@ export class Deparser {
             case 'TRANS_STMT_SAVEPOINT':
                 output.push('SAVEPOINT');
                 if (node.savepoint_name) {
-                    output.push(QuoteUtils.quote(node.savepoint_name));
+                    output.push(QuoteUtils.quoteIdentifier(node.savepoint_name));
                 }
                 break;
             case 'TRANS_STMT_RELEASE':
                 output.push('RELEASE SAVEPOINT');
                 if (node.savepoint_name) {
-                    output.push(QuoteUtils.quote(node.savepoint_name));
+                    output.push(QuoteUtils.quoteIdentifier(node.savepoint_name));
                 }
                 break;
             case 'TRANS_STMT_ROLLBACK_TO':
                 output.push('ROLLBACK TO');
                 if (node.savepoint_name) {
-                    output.push(QuoteUtils.quote(node.savepoint_name));
+                    output.push(QuoteUtils.quoteIdentifier(node.savepoint_name));
                 }
                 break;
             case 'TRANS_STMT_PREPARE':
                 output.push('PREPARE TRANSACTION');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(QuoteUtils.escape(node.gid));
                 }
                 break;
             case 'TRANS_STMT_COMMIT_PREPARED':
                 output.push('COMMIT PREPARED');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(QuoteUtils.escape(node.gid));
                 }
                 break;
             case 'TRANS_STMT_ROLLBACK_PREPARED':
                 output.push('ROLLBACK PREPARED');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(QuoteUtils.escape(node.gid));
                 }
                 break;
             default:
@@ -3767,28 +3995,39 @@ export class Deparser {
         switch (node.kind) {
             case 'VAR_SET_VALUE':
                 const localPrefix = node.is_local ? 'LOCAL ' : '';
+                if (node.jumble_args && node.name === 'xmloption' && node.args) {
+                    const xmlValue = this.getNodeData(ListUtils.unwrapList(node.args)[0]);
+                    const xmlOption = (typeof xmlValue.sval === 'object' ? xmlValue.sval.sval : xmlValue.sval) || '';
+                    return `SET ${localPrefix}XML OPTION ${xmlOption.toUpperCase()}`;
+                }
                 const args = node.args ? ListUtils.unwrapList(node.args).map(arg => {
                     const nodeData = this.getNodeData(arg);
                     if (nodeData.sval !== undefined) {
                         const svalValue = typeof nodeData.sval === 'object' ? nodeData.sval.sval : nodeData.sval;
-                        if (svalValue === '' || svalValue.includes(' ') || svalValue.includes('-') || /[A-Z]/.test(svalValue) || /^\d/.test(svalValue) || svalValue.includes('.') || svalValue.includes('$') || svalValue.toLowerCase() === 'all' || /^[+-]\d/.test(svalValue)) {
-                            return `'${svalValue}'`;
+                        if (!/^[a-z_][a-z0-9_]*$/.test(svalValue) || svalValue.includes(' ') || svalValue.includes('-') || /[A-Z]/.test(svalValue) || /^\d/.test(svalValue) || svalValue.includes('.') || svalValue.includes('$') || svalValue.toLowerCase() === 'all' || /^[+-]\d/.test(svalValue)) {
+                            return QuoteUtils.escape(svalValue);
                         }
                         return svalValue;
                     }
                     return this.visit(arg, context);
                 }).join(', ') : '';
+                if (node.jumble_args && node.name === 'timezone') {
+                    return `SET ${localPrefix}TIME ZONE ${args}`;
+                }
                 // Handle args - always include TO clause if args exist (even if empty string)
-                const paramName = node.name && (node.name.includes('.') || node.name.includes('-') || /[A-Z]/.test(node.name)) ? `"${node.name}"` : node.name;
+                const paramName = QuoteUtils.quoteIdentifier(node.name);
                 if (!node.args || node.args.length === 0) {
                     return `SET ${localPrefix}${paramName}`;
                 }
                 return `SET ${localPrefix}${paramName} TO ${args}`;
             case 'VAR_SET_DEFAULT':
-                const defaultParamName = node.name && (node.name.includes('.') || node.name.includes('-') || /[A-Z]/.test(node.name)) ? `"${node.name}"` : node.name;
+                if (node.jumble_args && node.name === 'timezone') {
+                    return `SET ${node.is_local ? 'LOCAL ' : ''}TIME ZONE DEFAULT`;
+                }
+                const defaultParamName = QuoteUtils.quoteIdentifier(node.name);
                 return `SET ${defaultParamName} TO DEFAULT`;
             case 'VAR_SET_CURRENT':
-                const currentParamName = node.name && (node.name.includes('.') || node.name.includes('-') || /[A-Z]/.test(node.name)) ? `"${node.name}"` : node.name;
+                const currentParamName = QuoteUtils.quoteIdentifier(node.name);
                 return `SET ${currentParamName} FROM CURRENT`;
             case 'VAR_SET_MULTI':
                 if (node.name === 'TRANSACTION' || node.name === 'SESSION CHARACTERISTICS') {
@@ -3862,7 +4101,7 @@ export class Deparser {
                     return `SET ${assignments}`;
                 }
             case 'VAR_RESET':
-                const resetParamName = node.name && (node.name.includes('.') || node.name.includes('-') || /[A-Z]/.test(node.name)) ? `"${node.name}"` : node.name;
+                const resetParamName = QuoteUtils.quoteIdentifier(node.name);
                 return `RESET ${resetParamName}`;
             case 'VAR_RESET_ALL':
                 return 'RESET ALL';
@@ -3882,7 +4121,7 @@ export class Deparser {
             output.push('IF NOT EXISTS');
         }
         if (node.schemaname) {
-            output.push(node.schemaname);
+            output.push(QuoteUtils.quoteIdentifier(node.schemaname));
         }
         if (node.authrole) {
             output.push('AUTHORIZATION');
@@ -4089,7 +4328,7 @@ export class Deparser {
                 if (objList && objList.List && objList.List.items) {
                     const items = objList.List.items.map((item) => {
                         if (item.String && item.String.sval) {
-                            return item.String.sval;
+                            return QuoteUtils.quoteIdentifier(item.String.sval);
                         }
                         return this.visit(item, context);
                     });
@@ -4131,7 +4370,7 @@ export class Deparser {
                     if (objList && objList.List && objList.List.items) {
                         const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
-                                return QuoteUtils.quote(item.String.sval);
+                                return QuoteUtils.quoteIdentifier(item.String.sval);
                             }
                             return this.visit(item, context);
                         }).filter((name) => name && name.trim());
@@ -4165,13 +4404,13 @@ export class Deparser {
                         if (items.length === 2) {
                             const accessMethod = items[0];
                             const objectName = items[1];
-                            return `${QuoteUtils.quote(objectName)} USING ${accessMethod}`;
+                            return `${QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`;
                         }
                         else if (items.length === 3) {
                             const accessMethod = items[0];
                             const schemaName = items[1];
                             const objectName = items[2];
-                            return `${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(objectName)} USING ${accessMethod}`;
+                            return `${QuoteUtils.quoteQualifiedIdentifier(schemaName, objectName)} USING ${accessMethod}`;
                         }
                         return items.join('.');
                     }
@@ -4214,7 +4453,7 @@ export class Deparser {
                     if (objList && objList.List && objList.List.items) {
                         const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
-                                return QuoteUtils.quote(item.String.sval);
+                                return QuoteUtils.quoteIdentifier(item.String.sval);
                             }
                             return this.visit(item, context);
                         }).filter((name) => name && name.trim());
@@ -4262,7 +4501,7 @@ export class Deparser {
     PLAssignStmt(node, context) {
         const output = [];
         if (node.name) {
-            let nameWithIndirection = QuoteUtils.quote(node.name);
+            let nameWithIndirection = QuoteUtils.quoteIdentifier(node.name);
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStr = node.indirection
                     .map((ind) => this.visit(ind, context))
@@ -4312,10 +4551,10 @@ export class Deparser {
             output.push('PROGRAM');
         }
         if (node.filename) {
-            output.push(`'${node.filename}'`);
+            output.push(QuoteUtils.escape(node.filename));
         }
         else {
-            output.push('STDIN');
+            output.push(node.is_from ? 'STDIN' : 'STDOUT');
         }
         if (node.options && node.options.length > 0) {
             output.push('WITH');
@@ -4411,7 +4650,7 @@ export class Deparser {
                             const parts = [];
                             const indentedParts = [];
                             if (colDefData.colname) {
-                                parts.push(QuoteUtils.quote(colDefData.colname));
+                                parts.push(QuoteUtils.quoteIdentifier(colDefData.colname));
                             }
                             if (colDefData.typeName) {
                                 parts.push(this.TypeName(colDefData.typeName, context));
@@ -4469,7 +4708,7 @@ export class Deparser {
                         else {
                             const parts = [];
                             if (colDefData.colname) {
-                                parts.push(QuoteUtils.quote(colDefData.colname));
+                                parts.push(QuoteUtils.quoteIdentifier(colDefData.colname));
                             }
                             if (colDefData.typeName) {
                                 parts.push(this.TypeName(colDefData.typeName, context));
@@ -4523,7 +4762,7 @@ export class Deparser {
                         }
                     }
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -4540,13 +4779,16 @@ export class Deparser {
                         output.push('ALTER COLUMN');
                     }
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('TYPE');
                     if (node.def) {
                         const nodeData = this.getNodeData(node.def);
                         if (nodeData && nodeData.typeName) {
                             output.push(this.TypeName(nodeData.typeName, context));
+                            if (nodeData.collClause) {
+                                output.push(this.CollateClause(nodeData.collClause, context));
+                            }
                             // Handle USING clause (stored in raw_default for ALTER COLUMN TYPE)
                             if (nodeData.raw_default) {
                                 output.push('USING');
@@ -4567,7 +4809,7 @@ export class Deparser {
                 case 'AT_SetTableSpace':
                     output.push('SET TABLESPACE');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_AddConstraint':
@@ -4585,7 +4827,7 @@ export class Deparser {
                         output.push('DROP CONSTRAINT');
                     }
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -4623,7 +4865,7 @@ export class Deparser {
                 case 'AT_ColumnDefault':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.def) {
                         output.push('SET DEFAULT');
@@ -4636,7 +4878,7 @@ export class Deparser {
                 case 'AT_SetStorage':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET STORAGE');
                     if (node.def) {
@@ -4647,7 +4889,7 @@ export class Deparser {
                 case 'AT_ClusterOn':
                     output.push('CLUSTER ON');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DropCluster':
@@ -4674,21 +4916,21 @@ export class Deparser {
                 case 'AT_SetNotNull':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET NOT NULL');
                     break;
                 case 'AT_DropNotNull':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP NOT NULL');
                     break;
                 case 'AT_SetStatistics':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     else if (node.num !== undefined && node.num !== null) {
                         output.push(node.num.toString());
@@ -4701,7 +4943,7 @@ export class Deparser {
                 case 'AT_SetOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET');
                     if (node.def) {
@@ -4718,7 +4960,7 @@ export class Deparser {
                 case 'AT_ResetOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('RESET');
                     if (node.def) {
@@ -4735,7 +4977,7 @@ export class Deparser {
                 case 'AT_SetCompression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET COMPRESSION');
                     if (node.def) {
@@ -4745,31 +4987,31 @@ export class Deparser {
                 case 'AT_ValidateConstraint':
                     output.push('VALIDATE CONSTRAINT');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableTrig':
                     output.push('ENABLE TRIGGER');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableAlwaysTrig':
                     output.push('ENABLE ALWAYS TRIGGER');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableReplicaTrig':
                     output.push('ENABLE REPLICA TRIGGER');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DisableTrig':
                     output.push('DISABLE TRIGGER');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableTrigAll':
@@ -4787,31 +5029,31 @@ export class Deparser {
                 case 'AT_EnableRule':
                     output.push('ENABLE RULE');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableAlwaysRule':
                     output.push('ENABLE ALWAYS RULE');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableReplicaRule':
                     output.push('ENABLE REPLICA RULE');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DisableRule':
                     output.push('DISABLE RULE');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_SetAccessMethod':
                     output.push('SET ACCESS METHOD');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     else {
                         // Handle DEFAULT access method case
@@ -4865,7 +5107,7 @@ export class Deparser {
                 case 'AT_CookedColumnDefault':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.def) {
                         output.push('SET DEFAULT');
@@ -4878,26 +5120,23 @@ export class Deparser {
                 case 'AT_SetExpression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET EXPRESSION');
                     if (node.def) {
-                        output.push(this.visit(node.def, context));
+                        output.push('AS');
+                        output.push(context.parens(this.visit(node.def, context)));
                     }
                     break;
                 case 'AT_DropExpression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP EXPRESSION');
-                    break;
-                case 'AT_CheckNotNull':
-                    output.push('ALTER COLUMN');
-                    if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                    if (node.missing_ok) {
+                        output.push('IF EXISTS');
                     }
-                    output.push('SET NOT NULL');
                     break;
                 case 'AT_AddIndex':
                     output.push('ADD');
@@ -4924,23 +5163,28 @@ export class Deparser {
                     }
                     break;
                 case 'AT_AlterConstraint':
-                    output.push('ALTER CONSTRAINT');
-                    if (node.def && this.getNodeType(node.def) === 'Constraint') {
-                        const constraintData = this.getNodeData(node.def);
-                        if (constraintData.conname) {
-                            output.push(QuoteUtils.quote(constraintData.conname));
-                            if (constraintData.deferrable !== undefined) {
-                                output.push(constraintData.deferrable ? 'DEFERRABLE' : 'NOT DEFERRABLE');
-                            }
-                            if (constraintData.initdeferred !== undefined) {
-                                output.push(constraintData.initdeferred ? 'INITIALLY DEFERRED' : 'INITIALLY IMMEDIATE');
+                    if (node.def && this.getNodeType(node.def) === 'ATAlterConstraint') {
+                        output.push(this.ATAlterConstraint(this.getNodeData(node.def), context));
+                    }
+                    else {
+                        output.push('ALTER CONSTRAINT');
+                        if (node.def && this.getNodeType(node.def) === 'Constraint') {
+                            const constraintData = this.getNodeData(node.def);
+                            if (constraintData.conname) {
+                                output.push(QuoteUtils.quoteIdentifier(constraintData.conname));
+                                if (constraintData.deferrable !== undefined) {
+                                    output.push(constraintData.deferrable ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+                                }
+                                if (constraintData.initdeferred !== undefined) {
+                                    output.push(constraintData.initdeferred ? 'INITIALLY DEFERRED' : 'INITIALLY IMMEDIATE');
+                                }
                             }
                         }
-                    }
-                    else if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
-                        if (node.def) {
-                            output.push(this.visit(node.def, context));
+                        else if (node.name) {
+                            output.push(QuoteUtils.quoteIdentifier(node.name));
+                            if (node.def) {
+                                output.push(this.visit(node.def, context));
+                            }
                         }
                     }
                     break;
@@ -4959,7 +5203,7 @@ export class Deparser {
                 case 'AT_AlterColumnGenericOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('OPTIONS');
                     if (node.def) {
@@ -5013,7 +5257,7 @@ export class Deparser {
                 case 'AT_AddIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('ADD');
                     if (node.def) {
@@ -5023,24 +5267,20 @@ export class Deparser {
                 case 'AT_SetIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
-                    output.push('SET');
                     if (node.def) {
-                        output.push(this.visit(node.def, context));
+                        output.push(this.formatIdentityColumnOptions(node.def, context));
                     }
                     break;
                 case 'AT_DropIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP IDENTITY');
-                    if (node.behavior === 'DROP_CASCADE') {
-                        output.push('CASCADE');
-                    }
-                    else if (node.behavior === 'DROP_RESTRICT') {
-                        output.push('RESTRICT');
+                    if (node.missing_ok) {
+                        output.push('IF EXISTS');
                     }
                     break;
                 case 'AT_ReAddStatistics':
@@ -5067,7 +5307,8 @@ export class Deparser {
             output.push('FUNCTION');
         }
         if (node.funcname && node.funcname.length > 0) {
-            const funcName = node.funcname.map((name) => this.visit(name, context)).join('.');
+            const funcnameParts = node.funcname.map((name) => name.String?.sval || name.String?.str || '').filter((s) => s);
+            const funcName = QuoteUtils.quoteDottedName(funcnameParts);
             if (node.parameters && node.parameters.length > 0) {
                 const params = node.parameters
                     .filter((param) => {
@@ -5076,7 +5317,13 @@ export class Deparser {
                 })
                     .map((param) => this.visit(param, context));
                 if (params.length > 0) {
-                    output.push(funcName + '(' + params.join(', ') + ')');
+                    if (context.isPretty()) {
+                        const formattedParams = params.map(p => context.indent(p)).join(',' + context.newline());
+                        output.push(funcName + '(' + context.newline() + formattedParams + context.newline() + ')');
+                    }
+                    else {
+                        output.push(funcName + '(' + params.join(', ') + ')');
+                    }
                 }
                 else {
                     output.push(funcName + '()');
@@ -5091,15 +5338,21 @@ export class Deparser {
             return paramData.mode === 'FUNC_PARAM_TABLE';
         });
         if (hasTableParams) {
-            output.push('RETURNS TABLE (');
             const tableParams = node.parameters
                 .filter((param) => {
                 const paramData = this.getNodeData(param);
                 return paramData.mode === 'FUNC_PARAM_TABLE';
             })
                 .map((param) => this.visit(param, context));
-            output.push(tableParams.join(', '));
-            output.push(')');
+            if (context.isPretty()) {
+                const formattedTableParams = tableParams.map(p => context.indent(p)).join(',' + context.newline());
+                output.push('RETURNS TABLE (' + context.newline() + formattedTableParams + context.newline() + ')');
+            }
+            else {
+                output.push('RETURNS TABLE (');
+                output.push(tableParams.join(', '));
+                output.push(')');
+            }
         }
         else if (node.returnType) {
             output.push('RETURNS');
@@ -5121,6 +5374,7 @@ export class Deparser {
                 if (bodyType === 'List') {
                     const statements = ListUtils.unwrapList(node.sql_body);
                     if (statements.length === 0 || (statements.length === 1 && Object.keys(statements[0]).length === 0)) {
+                        // empty body: nothing to emit
                     }
                     else {
                         // Handle nested List structure in BEGIN ATOMIC blocks
@@ -5172,7 +5426,7 @@ export class Deparser {
             }
         }
         if (node.name) {
-            output.push(QuoteUtils.quote(node.name));
+            output.push(QuoteUtils.quoteIdentifier(node.name));
         }
         if (node.argType) {
             output.push(this.TypeName(node.argType, context));
@@ -5244,7 +5498,7 @@ export class Deparser {
             output.push('ROLE');
         }
         if (node.role) {
-            const roleName = Deparser.needsQuotes(node.role) ? `"${node.role}"` : node.role;
+            const roleName = QuoteUtils.quoteIdentifier(node.role);
             output.push(roleName);
         }
         if (node.options) {
@@ -5268,25 +5522,28 @@ export class Deparser {
             if (node.arg && this.getNodeType(node.arg) === 'List') {
                 const listData = this.getNodeData(node.arg);
                 const listItems = ListUtils.unwrapList(listData.items);
+                const preservedName = this.preserveOperatorDefElemCase(node.defname);
                 if (listItems.length === 1 && listItems[0].String) {
-                    const preservedName = this.preserveOperatorDefElemCase(node.defname);
                     return `${preservedName} = ${listItems[0].String.sval}`;
                 }
+                if (listItems.length > 1 && listItems.every((item) => item.String)) {
+                    return `${preservedName} = OPERATOR(${this.qualifiedOperatorName(listItems)})`;
+                }
             }
         }
         // Handle IndexElem opclassopts - MUST be first to preserve string types
         if (context.parentNodeTypes.includes('IndexElem')) {
             if (node.arg && this.getNodeType(node.arg) === 'String') {
                 const stringData = this.getNodeData(node.arg);
-                return `${node.defname}='${stringData.sval}'`;
+                return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${QuoteUtils.escape(stringData.sval)}`;
             }
-            return `${node.defname}=${this.visit(node.arg, context.spawn('DefElem'))}`;
+            return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, this.visit(node.arg, context.spawn('DefElem')))}`;
         }
         // Handle CREATE OPERATOR boolean flags - MUST be first to preserve case
         if (context.parentNodeTypes.includes('DefineStmt') &&
             ['hashes', 'merges'].includes(node.defname.toLowerCase()) && !node.arg) {
             if (node.defname !== node.defname.toLowerCase() && node.defname !== node.defname.toUpperCase()) {
-                return `"${node.defname}"`;
+                return QuoteUtils.quoteIdentifier(node.defname);
             }
             return node.defname.charAt(0).toUpperCase() + node.defname.slice(1).toLowerCase();
         }
@@ -5305,12 +5562,8 @@ export class Deparser {
                 const defElemContext = context.spawn('DefElem');
                 const argValue = this.visit(node.arg, defElemContext);
                 if (context.parentNodeTypes.includes('CreateFdwStmt') || context.parentNodeTypes.includes('AlterFdwStmt')) {
-                    const finalValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                        ? `'${argValue}'`
-                        : argValue;
-                    const quotedDefname = node.defname.includes(' ') || node.defname.includes('-') || Deparser.needsQuotes(node.defname)
-                        ? `"${node.defname}"`
-                        : node.defname;
+                    const finalValue = this.quoteDefElemArg(node.arg, argValue);
+                    const quotedDefname = QuoteUtils.quoteIdentifier(node.defname);
                     if (node.defaction === 'DEFELEM_ADD') {
                         return `ADD ${quotedDefname} ${finalValue}`;
                     }
@@ -5322,9 +5575,7 @@ export class Deparser {
                     }
                     return `${quotedDefname} ${finalValue}`;
                 }
-                const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                    ? `'${argValue}'`
-                    : argValue;
+                const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                 if (node.defaction === 'DEFELEM_ADD') {
                     return `ADD ${node.defname} ${quotedValue}`;
                 }
@@ -5334,9 +5585,7 @@ export class Deparser {
                 else if (node.defaction === 'DEFELEM_SET') {
                     return `SET ${node.defname} ${quotedValue}`;
                 }
-                const quotedDefname = node.defname.includes(' ') || node.defname.includes('-')
-                    ? `"${node.defname}"`
-                    : node.defname;
+                const quotedDefname = QuoteUtils.quoteIdentifier(node.defname);
                 return `${quotedDefname} ${quotedValue}`;
             }
             else if (node.defaction === 'DEFELEM_DROP') {
@@ -5358,9 +5607,7 @@ export class Deparser {
                 }
                 const defElemContext = context.spawn('DefElem');
                 const argValue = this.visit(node.arg, defElemContext);
-                const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                    ? `'${argValue}'`
-                    : argValue;
+                const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                 return `PASSWORD ${quotedValue}`;
             }
         }
@@ -5383,6 +5630,9 @@ export class Deparser {
                     if (listItems.length === 1 && listItems[0].String) {
                         return `${node.defname} = ${listItems[0].String.sval}`;
                     }
+                    if (listItems.length > 1 && listItems.every((item) => item.String)) {
+                        return `${node.defname} = OPERATOR(${this.qualifiedOperatorName(listItems)})`;
+                    }
                 }
             }
             if (context.parentNodeTypes.includes('CreatedbStmt') || context.parentNodeTypes.includes('DropdbStmt')) {
@@ -5396,9 +5646,7 @@ export class Deparser {
                 const quotedValue = typeof argValue === 'string'
                     ? QuoteUtils.escape(argValue)
                     : argValue;
-                const quotedDefname = node.defname.includes(' ') || node.defname.includes('-')
-                    ? `"${node.defname}"`
-                    : node.defname;
+                const quotedDefname = QuoteUtils.quoteIdentifier(node.defname);
                 return `${quotedDefname} ${quotedValue}`;
             }
             if (context.parentNodeTypes.includes('CreateRoleStmt') || context.parentNodeTypes.includes('AlterRoleStmt')) {
@@ -5427,9 +5675,7 @@ export class Deparser {
                     }
                 }
                 if (node.defname === 'validUntil') {
-                    const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                        ? `'${argValue}'`
-                        : argValue;
+                    const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                     return `VALID UNTIL ${quotedValue}`;
                 }
                 if (node.defname === 'adminmembers') {
@@ -5468,15 +5714,15 @@ export class Deparser {
                     if (node.arg && this.getNodeType(node.arg) === 'List') {
                         const listData = this.getNodeData(node.arg);
                         const listItems = ListUtils.unwrapList(listData.items);
+                        if (listItems.length === 1 && listItems[0].String?.sval === 'none') {
+                            return 'OWNED BY NONE';
+                        }
                         const parts = listItems.map(item => {
                             const itemData = this.getNodeData(item);
                             if (this.getNodeType(item) === 'String') {
                                 // Check if this identifier needs quotes to preserve case
                                 const value = itemData.sval;
-                                if (Deparser.needsQuotes(value)) {
-                                    return `"${value}"`;
-                                }
-                                return value;
+                                return QuoteUtils.quoteIdentifier(value);
                             }
                             return this.visit(item, context);
                         });
@@ -5607,11 +5853,13 @@ 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 = this.quoteDefElemArg(node.arg, argValue);
+                        return `TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
-                        return `SCHEMA ${argValue}`;
+                        return `SET SCHEMA ${argValue}`;
                     }
                 }
                 // CreateFdwStmt specific cases
@@ -5628,28 +5876,37 @@ export class Deparser {
                 if (node.defname === 'cascade') {
                     return argValue === 'true' ? 'CASCADE' : '';
                 }
+                if (node.defname === 'new_version') {
+                    return `VERSION ${this.quoteDefElemArg(node.arg, argValue)}`;
+                }
+                if (node.defname === 'schema' && node.arg && this.getNodeType(node.arg) === 'String') {
+                    return `SCHEMA ${QuoteUtils.quoteIdentifier(this.getNodeData(node.arg).sval)}`;
+                }
                 return `${node.defname.toUpperCase()} ${argValue}`;
             }
             // Handle IndexStmt WITH clause options - no quotes, compact formatting
             if (context.parentNodeTypes.includes('IndexStmt')) {
-                return `${node.defname}=${argValue}`;
+                return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle IndexElem opclassopts - preserve string values as strings
             if (context.parentNodeTypes.includes('IndexElem')) {
                 if (node.arg && this.getNodeType(node.arg) === 'String') {
                     const stringData = this.getNodeData(node.arg);
-                    return `${node.defname}='${stringData.sval}'`;
+                    return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${QuoteUtils.escape(stringData.sval)}`;
                 }
-                return `${node.defname}=${argValue}`;
+                return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle CreateStmt table options - no quotes, compact formatting
             if (context.parentNodeTypes.includes('CreateStmt')) {
+                const relOptName = node.defnamespace
+                    ? `${QuoteUtils.quoteIdentifier(node.defnamespace)}.${QuoteUtils.quoteIdentifier(node.defname)}`
+                    : QuoteUtils.quoteIdentifier(node.defname);
                 // For numeric values, use the raw value without quotes
                 if (node.arg && this.getNodeType(node.arg) === 'Integer') {
                     const integerData = this.getNodeData(node.arg);
-                    return `${node.defname}=${integerData.ival}`;
+                    return `${relOptName}=${formatInteger(integerData.ival)}`;
                 }
-                return `${node.defname}=${argValue}`;
+                return `${relOptName}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle CreateEventTrigStmt WHEN clause - use IN syntax for List arguments
             if (context.parentNodeTypes.includes('CreateEventTrigStmt')) {
@@ -5659,7 +5916,7 @@ export class Deparser {
                     const values = listItems.map(item => {
                         if (this.getNodeType(item) === 'String') {
                             const stringData = this.getNodeData(item);
-                            return `'${stringData.sval || ''}'`;
+                            return QuoteUtils.escape(stringData.sval || '');
                         }
                         return this.visit(item, context);
                     });
@@ -5674,7 +5931,7 @@ export class Deparser {
                 if (node.arg && this.getNodeType(node.arg) === 'TypeName') {
                     return `${optionName} = ${argValue}`;
                 }
-                return `${optionName} = ${argValue}`;
+                return `${optionName} = ${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle ViewStmt WITH options - don't quote numeric values
             if (context.parentNodeTypes.includes('ViewStmt')) {
@@ -5688,15 +5945,27 @@ export class Deparser {
             }
             // Handle CopyStmt WITH clause options - uppercase format without quotes
             if (context.parentNodeTypes.includes('CopyStmt')) {
-                if (node.defname === 'format' && node.arg && this.getNodeType(node.arg) === 'String') {
-                    const stringData = this.getNodeData(node.arg);
-                    return `FORMAT ${stringData.sval.toUpperCase()}`;
+                const optName = node.defname.toUpperCase();
+                if (!node.arg) {
+                    return optName;
                 }
-                // Handle other COPY options with uppercase defname
-                if (node.arg) {
-                    return `${node.defname.toUpperCase()} ${argValue}`;
+                const copyArgType = this.getNodeType(node.arg);
+                if (copyArgType === 'Boolean' && this.getNodeData(node.arg).boolval !== false) {
+                    return optName;
                 }
-                return node.defname.toUpperCase();
+                if (copyArgType === 'List') {
+                    const items = ListUtils.unwrapList(this.getNodeData(node.arg).items)
+                        .map(item => this.visit(item, context));
+                    return `${optName} (${items.join(', ')})`;
+                }
+                if (copyArgType === 'String') {
+                    const sval = this.getNodeData(node.arg).sval;
+                    if (node.defname === 'format') {
+                        return `${optName} ${sval}`;
+                    }
+                    return `${optName} ${QuoteUtils.escape(sval)}`;
+                }
+                return `${optName} ${argValue}`;
             }
             // Handle CREATE OPERATOR and CREATE TYPE context
             if (context.parentNodeTypes.includes('DefineStmt')) {
@@ -5720,13 +5989,13 @@ export class Deparser {
                 // Handle boolean flags (no arguments) - preserve quoted case
                 if (['hashes', 'merges'].includes(node.defname.toLowerCase())) {
                     if (node.defname !== node.defname.toLowerCase() && node.defname !== node.defname.toUpperCase()) {
-                        return `"${node.defname}"`;
+                        return QuoteUtils.quoteIdentifier(node.defname);
                     }
                     return preservedName.toUpperCase();
                 }
                 // Handle CREATE AGGREGATE quoted identifiers - preserve quotes when needed
-                if (Deparser.needsQuotes(node.defname)) {
-                    const quotedDefname = `"${node.defname}"`;
+                const quotedDefname = QuoteUtils.quoteIdentifier(node.defname);
+                if (quotedDefname !== node.defname) {
                     if (node.arg) {
                         if (this.getNodeType(node.arg) === 'String') {
                             const stringData = this.getNodeData(node.arg);
@@ -5735,7 +6004,7 @@ export class Deparser {
                                 return `${quotedDefname} = ${stringData.sval}`;
                             }
                             // Regular string literals get single quotes
-                            return `${quotedDefname} = '${stringData.sval}'`;
+                            return `${quotedDefname} = ${QuoteUtils.escape(stringData.sval)}`;
                         }
                         return `${quotedDefname} = ${argValue}`;
                     }
@@ -5756,7 +6025,7 @@ export class Deparser {
                         return `${node.defname} = ${stringData.sval}`;
                     }
                     // Regular string literals get single quotes
-                    return `${node.defname} = '${stringData.sval}'`;
+                    return `${node.defname} = ${QuoteUtils.escape(stringData.sval)}`;
                 }
                 if (node.arg && this.getNodeType(node.arg) === 'Boolean') {
                     const boolData = this.getNodeData(node.arg);
@@ -5777,6 +6046,10 @@ export class Deparser {
                     return `${node.defname} = ${argValue}`;
                 }
             }
+            const argType = this.getNodeType(node.arg);
+            if (argType === 'TypeName' || argType === 'Integer' || argType === 'Float' || argType === 'Boolean') {
+                return `${node.defname} = ${argValue}`;
+            }
             const quotedValue = typeof argValue === 'string'
                 ? QuoteUtils.escape(argValue)
                 : argValue;
@@ -5786,7 +6059,7 @@ export class Deparser {
         if (context.parentNodeTypes.includes('DefineStmt') && !node.arg) {
             // Check if the original defname appears to be quoted (mixed case that's not all upper/lower)
             if (node.defname !== node.defname.toLowerCase() && node.defname !== node.defname.toUpperCase()) {
-                return `"${node.defname}"`;
+                return QuoteUtils.quoteIdentifier(node.defname);
             }
         }
         return node.defname.toUpperCase();
@@ -5802,7 +6075,7 @@ export class Deparser {
         }
         if (node.location) {
             output.push('LOCATION');
-            output.push(`'${node.location}'`);
+            output.push(QuoteUtils.escape(node.location));
         }
         if (node.options && node.options.length > 0) {
             output.push('WITH');
@@ -5866,6 +6139,7 @@ export class Deparser {
         if (node.extname) {
             output.push(this.quoteIfNeeded(node.extname));
         }
+        output.push('UPDATE');
         if (node.options && node.options.length > 0) {
             const extContext = context.spawn('AlterExtensionStmt');
             const options = ListUtils.unwrapList(node.options)
@@ -5875,6 +6149,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) {
@@ -5942,7 +6244,7 @@ export class Deparser {
                 case 'REPLICA_IDENTITY_INDEX':
                     output.push('USING', 'INDEX');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 default:
@@ -6001,7 +6303,7 @@ export class Deparser {
                         output.push('IF', 'EXISTS');
                     }
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -6010,7 +6312,7 @@ export class Deparser {
                 case 'AT_ValidateConstraint':
                     output.push('VALIDATE', 'CONSTRAINT');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'C':
@@ -6027,7 +6329,7 @@ export class Deparser {
                         output.push('IF', 'EXISTS');
                     }
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -6036,7 +6338,7 @@ export class Deparser {
                 case 'V':
                     output.push('VALIDATE', 'CONSTRAINT');
                     if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'O':
@@ -6107,7 +6409,7 @@ export class Deparser {
         }
         if (node.payload !== null && node.payload !== undefined) {
             output.push(',');
-            output.push(`'${node.payload}'`);
+            output.push(QuoteUtils.escape(node.payload));
         }
         return output.join(' ');
     }
@@ -6135,7 +6437,7 @@ export class Deparser {
         if (!node.filename) {
             throw new Error('LoadStmt requires filename');
         }
-        return `LOAD '${node.filename}'`;
+        return `LOAD ${QuoteUtils.escape(node.filename)}`;
     }
     DiscardStmt(node, context) {
         switch (node.target) {
@@ -6151,6 +6453,13 @@ export class Deparser {
                 throw new Error(`Unsupported DiscardStmt target: ${node.target}`);
         }
     }
+    /** `schema.op` for an operator name list: schema parts quoted, the operator symbol as is. */
+    qualifiedOperatorName(objname) {
+        const names = ListUtils.unwrapList(objname ?? []).map((n) => (n.String ? n.String.sval : 'unknown'));
+        if (names.length === 0)
+            return 'unknown';
+        return [...names.slice(0, -1).map((n) => QuoteUtils.quoteIdentifier(n)), names[names.length - 1]].join('.');
+    }
     CommentStmt(node, context) {
         const output = ['COMMENT ON'];
         if (node.objtype) {
@@ -6182,6 +6491,9 @@ export class Deparser {
                 case 'OBJECT_TABCONSTRAINT':
                     output.push('CONSTRAINT');
                     break;
+                case 'OBJECT_DOMCONSTRAINT':
+                    output.push('CONSTRAINT');
+                    break;
                 case 'OBJECT_TRIGGER':
                     output.push('TRIGGER');
                     break;
@@ -6258,23 +6570,30 @@ export class Deparser {
                             output.push(objectParts.join('.'));
                         }
                     }
-                    else if (node.objtype === 'OBJECT_TRIGGER') {
+                    else if (node.objtype === 'OBJECT_DOMCONSTRAINT') {
                         if (objectParts.length === 2) {
-                            const [table, trigger] = objectParts;
-                            output.push(trigger);
+                            const [domain, constraint] = objectParts;
+                            output.push(constraint, 'ON DOMAIN', domain);
+                        }
+                        else {
+                            output.push(objectParts.join('.'));
+                        }
+                    }
+                    else if (node.objtype === 'OBJECT_TRIGGER') {
+                        if (objectParts.length >= 2) {
+                            output.push(objectParts[objectParts.length - 1]);
                             output.push('ON');
-                            output.push(table);
+                            output.push(objectParts.slice(0, -1).join('.'));
                         }
                         else {
                             output.push(objectParts.join('.'));
                         }
                     }
                     else if (node.objtype === 'OBJECT_RULE') {
-                        if (objectParts.length === 2) {
-                            const [table, rule] = objectParts;
-                            output.push(rule);
+                        if (objectParts.length >= 2) {
+                            output.push(objectParts[objectParts.length - 1]);
                             output.push('ON');
-                            output.push(table);
+                            output.push(objectParts.slice(0, -1).join('.'));
                         }
                         else {
                             output.push(objectParts.join('.'));
@@ -6285,8 +6604,7 @@ export class Deparser {
                         // For operators, we need to handle ObjectWithArgs structure
                         if (node.object && node.object.ObjectWithArgs) {
                             const objWithArgs = node.object.ObjectWithArgs;
-                            let operatorName = objWithArgs.objname && objWithArgs.objname[0] && objWithArgs.objname[0].String
-                                ? objWithArgs.objname[0].String.sval : 'unknown';
+                            let operatorName = this.qualifiedOperatorName(objWithArgs.objname);
                             if (operatorName.startsWith('"') && operatorName.endsWith('"')) {
                                 operatorName = operatorName.slice(1, -1);
                             }
@@ -6324,7 +6642,13 @@ export class Deparser {
                     }
                     else if (node.objtype === 'OBJECT_POLICY') {
                         // Handle POLICY syntax: COMMENT ON POLICY policy_name ON table_name IS 'comment'
-                        if (objectParts.length === 2) {
+                        if (objectParts.length === 3) {
+                            const [schema, table, policy] = objectParts;
+                            output.push(policy);
+                            output.push('ON');
+                            output.push(`${schema}.${table}`);
+                        }
+                        else if (objectParts.length === 2) {
                             const [table, policy] = objectParts;
                             output.push(policy);
                             output.push('ON');
@@ -6347,6 +6671,9 @@ export class Deparser {
                             output.push(objectParts.join('.'));
                         }
                     }
+                    else if (node.objtype === 'OBJECT_CAST' && objectParts.length === 2) {
+                        output.push(`(${objectParts[0]} AS ${objectParts[1]})`);
+                    }
                     else {
                         output.push(objectParts.join('.'));
                     }
@@ -6355,8 +6682,7 @@ export class Deparser {
             else if (node.objtype === 'OBJECT_OPERATOR' && node.object && node.object.ObjectWithArgs) {
                 // Handle direct ObjectWithArgs for OPERATOR syntax: COMMENT ON OPERATOR -(NONE, integer) IS 'comment'
                 const objWithArgs = node.object.ObjectWithArgs;
-                let operatorName = objWithArgs.objname && objWithArgs.objname[0] && objWithArgs.objname[0].String
-                    ? objWithArgs.objname[0].String.sval : 'unknown';
+                let operatorName = this.qualifiedOperatorName(objWithArgs.objname);
                 // Remove quotes from operator name if present
                 if (operatorName.startsWith('"') && operatorName.endsWith('"')) {
                     operatorName = operatorName.slice(1, -1);
@@ -6425,7 +6751,7 @@ export class Deparser {
         const output = [];
         const initialParts = ['CREATE', 'POLICY'];
         if (node.policy_name) {
-            initialParts.push(QuoteUtils.quote(node.policy_name));
+            initialParts.push(QuoteUtils.quoteIdentifier(node.policy_name));
         }
         output.push(initialParts.join(' '));
         // Add ON clause on new line in pretty mode
@@ -6502,7 +6828,7 @@ export class Deparser {
     AlterPolicyStmt(node, context) {
         const output = ['ALTER', 'POLICY'];
         if (node.policy_name) {
-            output.push(QuoteUtils.quote(node.policy_name));
+            output.push(QuoteUtils.quoteIdentifier(node.policy_name));
         }
         if (node.table) {
             output.push('ON');
@@ -6538,7 +6864,7 @@ export class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(`"${node.servername}"`);
+            output.push(QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -6586,10 +6912,10 @@ export class Deparser {
     CreatePublicationStmt(node, context) {
         const output = ['CREATE', 'PUBLICATION'];
         if (node.pubname) {
-            output.push(`"${node.pubname}"`);
+            output.push(QuoteUtils.quoteIdentifier(node.pubname));
         }
         if (node.pubobjects && node.pubobjects.length > 0) {
-            output.push('FOR', 'TABLE');
+            output.push('FOR');
             const tables = ListUtils.unwrapList(node.pubobjects).map(table => this.visit(table, context));
             output.push(tables.join(', '));
         }
@@ -6606,11 +6932,11 @@ export class Deparser {
     CreateSubscriptionStmt(node, context) {
         const output = ['CREATE', 'SUBSCRIPTION'];
         if (node.subname) {
-            output.push(`"${node.subname}"`);
+            output.push(QuoteUtils.quoteIdentifier(node.subname));
         }
         output.push('CONNECTION');
         if (node.conninfo) {
-            output.push(`'${node.conninfo}'`);
+            output.push(QuoteUtils.escape(node.conninfo));
         }
         output.push('PUBLICATION');
         if (node.publication && node.publication.length > 0) {
@@ -6627,10 +6953,11 @@ export class Deparser {
     AlterPublicationStmt(node, context) {
         const output = ['ALTER', 'PUBLICATION'];
         if (node.pubname) {
-            output.push(`"${node.pubname}"`);
+            output.push(QuoteUtils.quoteIdentifier(node.pubname));
         }
-        if (node.action) {
-            switch (node.action) {
+        const hasObjects = node.pubobjects && node.pubobjects.length > 0;
+        if (hasObjects) {
+            switch (node.action || 'AP_AddObjects') {
                 case 'AP_AddObjects':
                     output.push('ADD');
                     break;
@@ -6643,17 +6970,11 @@ export class Deparser {
                 default:
                     throw new Error(`Unsupported AlterPublicationStmt action: ${node.action}`);
             }
-        }
-        if (node.for_all_tables) {
-            output.push('FOR ALL TABLES');
-        }
-        else if (node.pubobjects && node.pubobjects.length > 0) {
-            output.push('FOR TABLE');
             const objects = ListUtils.unwrapList(node.pubobjects).map(obj => this.visit(obj, context));
             output.push(objects.join(', '));
         }
-        if (node.options && node.options.length > 0) {
-            output.push('WITH');
+        else if (node.options && node.options.length > 0) {
+            output.push('SET');
             const options = ListUtils.unwrapList(node.options).map(opt => this.visit(opt, context));
             output.push(`(${options.join(', ')})`);
         }
@@ -6662,44 +6983,69 @@ export class Deparser {
     AlterSubscriptionStmt(node, context) {
         const output = ['ALTER', 'SUBSCRIPTION'];
         if (node.subname) {
-            output.push(`"${node.subname}"`);
-        }
-        if (node.kind) {
-            switch (node.kind) {
+            output.push(QuoteUtils.quoteIdentifier(node.subname));
+        }
+        const options = node.options && node.options.length > 0
+            ? `(${ListUtils.unwrapList(node.options).map(opt => this.visit(opt, context)).join(', ')})`
+            : null;
+        const publications = node.publication && node.publication.length > 0
+            ? ListUtils.unwrapList(node.publication).map(pub => this.visit(pub, context)).join(', ')
+            : null;
+        {
+            switch (node.kind || 'ALTER_SUBSCRIPTION_OPTIONS') {
                 case 'ALTER_SUBSCRIPTION_OPTIONS':
                     output.push('SET');
+                    if (options)
+                        output.push(options);
                     break;
                 case 'ALTER_SUBSCRIPTION_CONNECTION':
                     output.push('CONNECTION');
                     if (node.conninfo) {
-                        output.push(`'${node.conninfo}'`);
+                        output.push(QuoteUtils.escape(node.conninfo));
                     }
                     break;
                 case 'ALTER_SUBSCRIPTION_SET_PUBLICATION':
                     output.push('SET PUBLICATION');
-                    if (node.publication && node.publication.length > 0) {
-                        const publications = ListUtils.unwrapList(node.publication).map(pub => this.visit(pub, context));
-                        output.push(publications.join(', '));
-                    }
+                    if (publications)
+                        output.push(publications);
+                    if (options)
+                        output.push('WITH', options);
+                    break;
+                case 'ALTER_SUBSCRIPTION_ADD_PUBLICATION':
+                    output.push('ADD PUBLICATION');
+                    if (publications)
+                        output.push(publications);
+                    if (options)
+                        output.push('WITH', options);
+                    break;
+                case 'ALTER_SUBSCRIPTION_DROP_PUBLICATION':
+                    output.push('DROP PUBLICATION');
+                    if (publications)
+                        output.push(publications);
+                    if (options)
+                        output.push('WITH', options);
                     break;
                 case 'ALTER_SUBSCRIPTION_REFRESH':
                     output.push('REFRESH PUBLICATION');
+                    if (options)
+                        output.push('WITH', options);
                     break;
-                case 'ALTER_SUBSCRIPTION_ENABLED':
-                    output.push('ENABLE');
+                case 'ALTER_SUBSCRIPTION_ENABLED': {
+                    const enabled = ListUtils.unwrapList(node.options).find(opt => opt.DefElem?.defname === 'enabled');
+                    const arg = enabled?.DefElem?.arg;
+                    const isEnabled = arg?.Boolean ? arg.Boolean.boolval !== false : true;
+                    output.push(isEnabled ? 'ENABLE' : 'DISABLE');
                     break;
+                }
                 case 'ALTER_SUBSCRIPTION_SKIP':
                     output.push('SKIP');
+                    if (options)
+                        output.push(options);
                     break;
                 default:
                     throw new Error(`Unsupported AlterSubscriptionStmt kind: ${node.kind}`);
             }
         }
-        if (node.options && node.options.length > 0) {
-            output.push('WITH');
-            const options = ListUtils.unwrapList(node.options).map(opt => this.visit(opt, context));
-            output.push(`(${options.join(', ')})`);
-        }
         return output.join(' ');
     }
     DropSubscriptionStmt(node, context) {
@@ -6708,7 +7054,7 @@ export class Deparser {
             output.push('IF EXISTS');
         }
         if (node.subname) {
-            output.push(`"${node.subname}"`);
+            output.push(QuoteUtils.quoteIdentifier(node.subname));
         }
         if (node.behavior) {
             switch (node.behavior) {
@@ -6953,7 +7299,7 @@ export class Deparser {
     ClosePortalStmt(node, context) {
         const output = ['CLOSE'];
         if (node.portalname) {
-            output.push(QuoteUtils.quote(node.portalname));
+            output.push(QuoteUtils.quoteIdentifier(node.portalname));
         }
         else {
             output.push('ALL');
@@ -7011,7 +7357,7 @@ export class Deparser {
             output.push('ALL');
         }
         if (node.portalname) {
-            output.push(QuoteUtils.quote(node.portalname));
+            output.push(QuoteUtils.quoteIdentifier(node.portalname));
         }
         return output.join(' ');
     }
@@ -7081,7 +7427,7 @@ export class Deparser {
     AlterFdwStmt(node, context) {
         const output = ['ALTER', 'FOREIGN', 'DATA', 'WRAPPER'];
         if (node.fdwname) {
-            output.push(QuoteUtils.quote(node.fdwname));
+            output.push(QuoteUtils.quoteIdentifier(node.fdwname));
         }
         if (node.func_options && node.func_options.length > 0) {
             const fdwContext = context.spawn('AlterFdwStmt');
@@ -7102,7 +7448,7 @@ export class Deparser {
             output.push('IF', 'NOT', 'EXISTS');
         }
         if (node.servername) {
-            output.push(QuoteUtils.quote(node.servername));
+            output.push(QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.servertype) {
             output.push('TYPE', QuoteUtils.escape(node.servertype));
@@ -7111,7 +7457,7 @@ export class Deparser {
             output.push('VERSION', QuoteUtils.escape(node.version));
         }
         if (node.fdwname) {
-            output.push('FOREIGN', 'DATA', 'WRAPPER', QuoteUtils.quote(node.fdwname));
+            output.push('FOREIGN', 'DATA', 'WRAPPER', QuoteUtils.quoteIdentifier(node.fdwname));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -7126,7 +7472,7 @@ export class Deparser {
     AlterForeignServerStmt(node, context) {
         const output = ['ALTER', 'SERVER'];
         if (node.servername) {
-            output.push(QuoteUtils.quote(node.servername));
+            output.push(QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.version) {
             output.push('VERSION', QuoteUtils.escape(node.version));
@@ -7151,7 +7497,7 @@ export class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(QuoteUtils.quote(node.servername));
+            output.push(QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -7175,14 +7521,14 @@ export class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(QuoteUtils.quote(node.servername));
+            output.push(QuoteUtils.quoteIdentifier(node.servername));
         }
         return output.join(' ');
     }
     ImportForeignSchemaStmt(node, context) {
         const output = ['IMPORT', 'FOREIGN', 'SCHEMA'];
         if (node.remote_schema) {
-            output.push(QuoteUtils.quote(node.remote_schema));
+            output.push(QuoteUtils.quoteIdentifier(node.remote_schema));
         }
         if (node.list_type) {
             switch (node.list_type) {
@@ -7208,11 +7554,11 @@ export class Deparser {
         }
         output.push('FROM', 'SERVER');
         if (node.server_name) {
-            output.push(QuoteUtils.quote(node.server_name));
+            output.push(QuoteUtils.quoteIdentifier(node.server_name));
         }
         output.push('INTO');
         if (node.local_schema) {
-            output.push(QuoteUtils.quote(node.local_schema));
+            output.push(QuoteUtils.quoteIdentifier(node.local_schema));
         }
         if (node.options && node.options.length > 0) {
             const importSchemaContext = context.spawn('ImportForeignSchemaStmt');
@@ -7226,7 +7572,7 @@ export class Deparser {
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
             if (node.indexname) {
-                output.push('USING', `"${node.indexname}"`);
+                output.push('USING', QuoteUtils.quoteIdentifier(node.indexname));
             }
         }
         if (node.params && node.params.length > 0) {
@@ -7290,7 +7636,7 @@ export class Deparser {
             output.push(this.RangeVar(node.relation, context));
         }
         if (node.name) {
-            output.push(`"${node.name}"`);
+            output.push(QuoteUtils.quoteIdentifier(node.name));
         }
         return output.join(' ');
     }
@@ -7330,7 +7676,7 @@ export class Deparser {
         if (!node.dbname) {
             throw new Error('CreatedbStmt requires dbname');
         }
-        output.push(`"${node.dbname}"`);
+        output.push(QuoteUtils.quoteIdentifier(node.dbname));
         if (node.options && node.options.length > 0) {
             const options = ListUtils.unwrapList(node.options)
                 .map(option => this.visit(option, context))
@@ -7347,7 +7693,7 @@ export class Deparser {
         if (!node.dbname) {
             throw new Error('DropdbStmt requires dbname');
         }
-        output.push(`"${node.dbname}"`);
+        output.push(QuoteUtils.quoteIdentifier(node.dbname));
         if (node.options && node.options.length > 0) {
             const options = ListUtils.unwrapList(node.options)
                 .map(option => this.visit(option, context))
@@ -7445,7 +7791,7 @@ export class Deparser {
             case 'OBJECT_POLICY':
                 output.push('POLICY');
                 if (node.subname) {
-                    output.push(QuoteUtils.quote(node.subname));
+                    output.push(QuoteUtils.quoteIdentifier(node.subname));
                 }
                 break;
             case 'OBJECT_PUBLICATION':
@@ -7503,7 +7849,7 @@ export class Deparser {
         }
         // Handle OBJECT_RULE special case: rule_name ON table_name format
         if (node.renameType === 'OBJECT_RULE' && node.subname && node.relation) {
-            output.push(QuoteUtils.quote(node.subname));
+            output.push(QuoteUtils.quoteIdentifier(node.subname));
             output.push('ON');
             output.push(this.RangeVar(node.relation, context));
         }
@@ -7522,12 +7868,21 @@ export class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const objectName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(objectName)} USING ${accessMethod}`);
+                    output.push(`${QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
                 }
             }
+            else if ((node.renameType === 'OBJECT_TYPE' || node.renameType === 'OBJECT_DOMAIN') && node.object.List) {
+                // Qualified type names - join List parts with dots
+                const items = ListUtils.unwrapList(node.object);
+                const parts = items
+                    .map((item) => item.String?.sval)
+                    .filter((s) => typeof s === 'string')
+                    .map((s) => this.quoteIfNeeded(s));
+                output.push(parts.join('.'));
+            }
             else if (node.renameType === 'OBJECT_SCHEMA' && node.object.List) {
                 // Handle schema names - extract from List structure
                 const items = ListUtils.unwrapList(node.object);
@@ -7543,19 +7898,19 @@ export class Deparser {
             }
         }
         if (node.renameType === 'OBJECT_COLUMN' && node.subname) {
-            output.push('RENAME COLUMN', `"${node.subname}"`, 'TO');
+            output.push('RENAME COLUMN', QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_DOMCONSTRAINT' && node.subname) {
-            output.push('RENAME CONSTRAINT', `"${node.subname}"`, 'TO');
+            output.push('RENAME CONSTRAINT', QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_TABCONSTRAINT' && node.subname) {
-            output.push('RENAME CONSTRAINT', `"${node.subname}"`, 'TO');
+            output.push('RENAME CONSTRAINT', QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_ATTRIBUTE' && node.subname) {
-            output.push('RENAME ATTRIBUTE', `"${node.subname}"`, 'TO');
+            output.push('RENAME ATTRIBUTE', QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_ROLE' && node.subname) {
-            output.push(`"${node.subname}"`, 'RENAME TO');
+            output.push(QuoteUtils.quoteIdentifier(node.subname), 'RENAME TO');
         }
         else if (node.renameType === 'OBJECT_SCHEMA' && node.subname) {
             output.push(this.quoteIfNeeded(node.subname), 'RENAME TO');
@@ -7569,7 +7924,7 @@ export class Deparser {
         if (!node.newname) {
             throw new Error('RenameStmt requires newname');
         }
-        output.push(QuoteUtils.quote(node.newname));
+        output.push(QuoteUtils.quoteIdentifier(node.newname));
         // Handle CASCADE/RESTRICT behavior for RENAME operations
         if (node.behavior === 'DROP_CASCADE') {
             output.push('CASCADE');
@@ -7581,76 +7936,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));
         }
@@ -7661,7 +7947,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const objectName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(objectName)} USING ${accessMethod}`);
+                    output.push(`${QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -7736,6 +8022,9 @@ export class Deparser {
                 else if (node.objtype === 'OBJECT_LANGUAGE') {
                     output.push('LANGUAGE');
                 }
+                else if (node.objtype === 'OBJECT_SEQUENCE') {
+                    output.push('SEQUENCE');
+                }
                 else if (node.objtype === 'OBJECT_FUNCTION') {
                     output.push('FUNCTION');
                 }
@@ -7761,8 +8050,11 @@ export class Deparser {
                     output.push('DATABASE');
                 }
                 if (node.objects && node.objects.length > 0) {
+                    const qualifiedKinds = ['OBJECT_TYPE', 'OBJECT_DOMAIN'];
                     const objects = ListUtils.unwrapList(node.objects)
-                        .map(obj => this.visit(obj, context))
+                        .map(obj => qualifiedKinds.includes(node.objtype) && obj.List
+                        ? ListUtils.unwrapList(obj.List.items).map((item) => this.visit(item, context)).join('.')
+                        : this.visit(obj, context))
                         .join(', ');
                     output.push(objects);
                 }
@@ -7801,8 +8093,11 @@ export class Deparser {
                 break;
             default:
                 if (node.objects && node.objects.length > 0) {
+                    const qualifiedKinds = ['OBJECT_TYPE', 'OBJECT_DOMAIN'];
                     const objects = ListUtils.unwrapList(node.objects)
-                        .map(obj => this.visit(obj, context))
+                        .map(obj => qualifiedKinds.includes(node.objtype) && obj.List
+                        ? ListUtils.unwrapList(obj.List.items).map((item) => this.visit(item, context)).join('.')
+                        : this.visit(obj, context))
                         .join(', ');
                     output.push(objects);
                 }
@@ -7822,6 +8117,9 @@ export class Deparser {
         if (node.grant_option && node.is_grant) {
             output.push('WITH GRANT OPTION');
         }
+        if (node.grantor) {
+            output.push('GRANTED BY', this.RoleSpec(node.grantor, context));
+        }
         // Only add behavior clauses for REVOKE statements, not for GRANT statements in ALTER DEFAULT PRIVILEGES
         if (!node.is_grant) {
             if (node.behavior === 'DROP_CASCADE') {
@@ -7835,57 +8133,34 @@ export class Deparser {
     }
     GrantRoleStmt(node, context) {
         const output = [];
-        // Check for inherit, admin, and set options first to place them correctly
-        let hasInheritOption = false;
-        let hasAdminOption = false;
-        let hasSetOption = false;
-        let inheritValue;
-        let adminValue;
-        let setValue;
-        if (node.opt && node.opt.length > 0) {
-            const options = ListUtils.unwrapList(node.opt);
-            const inheritOption = options.find(opt => opt.DefElem && opt.DefElem.defname === 'inherit');
-            const adminOption = options.find(opt => (opt.String && opt.String.sval === 'admin') ||
-                (opt.DefElem && opt.DefElem.defname === 'admin'));
-            const setOption = options.find(opt => opt.DefElem && opt.DefElem.defname === 'set');
-            if (inheritOption && inheritOption.DefElem) {
-                hasInheritOption = true;
-                inheritValue = inheritOption.DefElem.arg?.Boolean?.boolval;
-            }
-            if (adminOption) {
-                hasAdminOption = true;
-                if (adminOption.DefElem && adminOption.DefElem.arg) {
-                    adminValue = adminOption.DefElem.arg.Boolean?.boolval;
-                }
-            }
-            if (setOption && setOption.DefElem) {
-                hasSetOption = true;
-                setValue = setOption.DefElem.arg?.Boolean?.boolval;
-            }
-        }
+        const options = ListUtils.unwrapList(node.opt)
+            .map(opt => opt.DefElem)
+            .filter((opt) => !!opt && !!opt.defname);
+        const optionValue = (opt) => {
+            if (!opt.arg)
+                return true;
+            const argType = this.getNodeType(opt.arg);
+            const argData = this.getNodeData(opt.arg);
+            if (argType === 'Boolean')
+                return argData.boolval !== false;
+            if (argType === 'String')
+                return argData.sval !== 'false';
+            return true;
+        };
+        const roles = ListUtils.unwrapList(node.granted_roles)
+            .map(role => role.AccessPriv?.priv_name
+            ? QuoteUtils.quoteIdentifier(role.AccessPriv.priv_name)
+            : this.visit(role, context))
+            .join(', ');
         if (node.is_grant) {
-            output.push('GRANT');
+            output.push('GRANT', roles, 'TO');
         }
         else {
             output.push('REVOKE');
-            if (hasInheritOption) {
-                output.push('INHERIT OPTION FOR');
-            }
-            else if (hasAdminOption) {
-                output.push('ADMIN OPTION FOR');
+            if (options.length > 0) {
+                output.push(`${options[0].defname.toUpperCase()} OPTION FOR`);
             }
-        }
-        if (node.granted_roles && node.granted_roles.length > 0) {
-            const roles = ListUtils.unwrapList(node.granted_roles)
-                .map(role => this.visit(role, context))
-                .join(', ');
-            output.push(roles);
-        }
-        if (node.is_grant) {
-            output.push('TO');
-        }
-        else {
-            output.push('FROM');
+            output.push(roles, 'FROM');
         }
         if (node.grantee_roles && node.grantee_roles.length > 0) {
             const grantees = ListUtils.unwrapList(node.grantee_roles)
@@ -7893,45 +8168,22 @@ export class Deparser {
                 .join(', ');
             output.push(grantees);
         }
-        if (node.is_grant) {
-            const withOptions = [];
-            if (hasAdminOption) {
-                if (adminValue === true) {
-                    withOptions.push('ADMIN OPTION');
-                }
-                else if (adminValue === false) {
-                    withOptions.push('ADMIN FALSE');
-                }
-                else {
-                    withOptions.push('ADMIN OPTION');
-                }
-            }
-            if (hasInheritOption) {
-                if (inheritValue === true) {
-                    withOptions.push('INHERIT OPTION');
-                }
-                else if (inheritValue === false) {
-                    withOptions.push('INHERIT FALSE');
-                }
-            }
-            if (hasSetOption) {
-                if (setValue === true) {
-                    withOptions.push('SET TRUE');
-                }
-                else if (setValue === false) {
-                    withOptions.push('SET FALSE');
-                }
-            }
-            if (withOptions.length > 0) {
-                output.push('WITH', withOptions.join(', '));
-            }
+        if (node.is_grant && options.length > 0) {
+            const withOptions = options.map(opt => `${opt.defname.toUpperCase()} ${optionValue(opt) ? 'TRUE' : 'FALSE'}`);
+            output.push('WITH', withOptions.join(', '));
+        }
+        if (node.grantor) {
+            output.push('GRANTED BY', this.RoleSpec(node.grantor, context));
+        }
+        if (!node.is_grant && node.behavior === 'DROP_CASCADE') {
+            output.push('CASCADE');
         }
         return output.join(' ');
     }
     SecLabelStmt(node, context) {
         const output = ['SECURITY LABEL'];
         if (node.provider) {
-            output.push('FOR', `"${node.provider}"`);
+            output.push('FOR', QuoteUtils.quoteIdentifier(node.provider));
         }
         output.push('ON');
         if (node.objtype) {
@@ -7959,11 +8211,21 @@ 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) {
-            output.push(`'${node.label}'`);
+            output.push(QuoteUtils.escape(node.label));
         }
         else {
             output.push('NULL');
@@ -8020,10 +8282,10 @@ export class Deparser {
             output.push(conversionName);
         }
         if (node.for_encoding_name) {
-            output.push('FOR', `'${node.for_encoding_name}'`);
+            output.push('FOR', QuoteUtils.escape(node.for_encoding_name));
         }
         if (node.to_encoding_name) {
-            output.push('TO', `'${node.to_encoding_name}'`);
+            output.push('TO', QuoteUtils.escape(node.to_encoding_name));
         }
         if (node.func_name && node.func_name.length > 0) {
             output.push('FROM');
@@ -8084,7 +8346,7 @@ export class Deparser {
         }
         output.push('LANGUAGE');
         if (node.plname) {
-            output.push(QuoteUtils.quote(node.plname));
+            output.push(QuoteUtils.quoteIdentifier(node.plname));
         }
         if (node.plhandler && node.plhandler.length > 0) {
             output.push('HANDLER');
@@ -8120,7 +8382,7 @@ export class Deparser {
         }
         output.push('LANGUAGE');
         if (node.lang) {
-            output.push(QuoteUtils.quote(node.lang));
+            output.push(QuoteUtils.quoteIdentifier(node.lang));
         }
         output.push('(');
         const transforms = [];
@@ -8148,7 +8410,7 @@ export class Deparser {
         }
         output.push('TRIGGER');
         if (node.trigname) {
-            output.push(QuoteUtils.quote(node.trigname));
+            output.push(QuoteUtils.quoteIdentifier(node.trigname));
         }
         if (context.isPretty()) {
             const components = [];
@@ -8186,6 +8448,9 @@ export class Deparser {
                     .join(' ');
                 components.push(context.indent('REFERENCING ' + transitionClauses));
             }
+            if (node.constrrel) {
+                components.push(context.indent('FROM ' + this.RangeVar(node.constrrel, context)));
+            }
             if (node.deferrable) {
                 components.push(context.indent('DEFERRABLE'));
             }
@@ -8207,7 +8472,7 @@ export class Deparser {
                 const funcName = ListUtils.unwrapList(node.funcname)
                     .map(name => this.visit(name, context))
                     .join('.');
-                executeStr += ' PROCEDURE ' + funcName;
+                executeStr += ' FUNCTION ' + funcName;
             }
             if (node.args && node.args.length > 0) {
                 const argContext = context.spawn('CreateTrigStmt', { isStringLiteral: true });
@@ -8312,14 +8577,14 @@ export class Deparser {
             output.push('OLD TABLE AS');
         }
         if (node.name) {
-            output.push(QuoteUtils.quote(node.name));
+            output.push(QuoteUtils.quoteIdentifier(node.name));
         }
         return output.join(' ');
     }
     CreateEventTrigStmt(node, context) {
         const output = ['CREATE EVENT TRIGGER'];
         if (node.trigname) {
-            output.push(QuoteUtils.quote(node.trigname));
+            output.push(QuoteUtils.quoteIdentifier(node.trigname));
         }
         output.push('ON');
         if (node.eventname) {
@@ -8345,7 +8610,7 @@ export class Deparser {
     AlterEventTrigStmt(node, context) {
         const output = ['ALTER EVENT TRIGGER'];
         if (node.trigname) {
-            output.push(QuoteUtils.quote(node.trigname));
+            output.push(QuoteUtils.quoteIdentifier(node.trigname));
         }
         if (node.tgenabled) {
             switch (node.tgenabled) {
@@ -8465,6 +8730,74 @@ export class Deparser {
                 .join(' ');
             output.push(whenClauses);
         }
+        if (node.returningClause) {
+            output.push(this.ReturningClause(node.returningClause, context));
+        }
+        return output.join(' ');
+    }
+    MergeSupportFunc(node, context) {
+        return 'merge_action()';
+    }
+    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');
+                if (node.targetList && node.targetList.length > 0) {
+                    output.push(this.formatUpdateAssignments(node.targetList, context));
+                }
+                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) {
@@ -8480,11 +8813,11 @@ export class Deparser {
         }
         output.push('ALL', 'IN', 'TABLESPACE');
         if (node.orig_tablespacename) {
-            output.push(QuoteUtils.quote(node.orig_tablespacename));
+            output.push(QuoteUtils.quoteIdentifier(node.orig_tablespacename));
         }
         output.push('SET', 'TABLESPACE');
         if (node.new_tablespacename) {
-            output.push(QuoteUtils.quote(node.new_tablespacename));
+            output.push(QuoteUtils.quoteIdentifier(node.new_tablespacename));
         }
         if (node.nowait) {
             output.push('NOWAIT');
@@ -8508,10 +8841,10 @@ export class Deparser {
             const sequenceName = [];
             const seq = node.sequence;
             if (seq.schemaname) {
-                sequenceName.push(QuoteUtils.quote(seq.schemaname));
+                sequenceName.push(QuoteUtils.quoteIdentifier(seq.schemaname));
             }
             if (seq.relname) {
-                sequenceName.push(QuoteUtils.quote(seq.relname));
+                sequenceName.push(QuoteUtils.quoteIdentifier(seq.relname));
             }
             output.push(sequenceName.join('.'));
         }
@@ -8545,10 +8878,10 @@ export class Deparser {
             const sequenceName = [];
             const seq = node.sequence;
             if (seq.schemaname) {
-                sequenceName.push(QuoteUtils.quote(seq.schemaname));
+                sequenceName.push(QuoteUtils.quoteIdentifier(seq.schemaname));
             }
             if (seq.relname) {
-                sequenceName.push(QuoteUtils.quote(seq.relname));
+                sequenceName.push(QuoteUtils.quoteIdentifier(seq.relname));
             }
             output.push(sequenceName.join('.'));
         }
@@ -8833,6 +9166,13 @@ export class Deparser {
             output.push('USING');
             output.push(node.into.accessMethod);
         }
+        if (node.into && node.into.options && node.into.options.length > 0) {
+            output.push('WITH');
+            const options = ListUtils.unwrapList(node.into.options)
+                .map(option => this.visit(option, context.spawn('CreateStmt')))
+                .join(', ');
+            output.push(`(${options})`);
+        }
         if (node.into && node.into.onCommit && node.into.onCommit !== 'ONCOMMIT_NOOP') {
             output.push('ON COMMIT');
             switch (node.into.onCommit) {
@@ -8847,17 +9187,13 @@ export class Deparser {
                     break;
             }
         }
+        if (node.into && node.into.tableSpaceName) {
+            output.push('TABLESPACE', QuoteUtils.quoteIdentifier(node.into.tableSpaceName));
+        }
         output.push('AS');
         if (node.query) {
             output.push(this.visit(node.query, context));
         }
-        if (node.into && node.into.options && node.into.options.length > 0) {
-            output.push('WITH');
-            const options = ListUtils.unwrapList(node.into.options)
-                .map(option => this.visit(option, context))
-                .join(', ');
-            output.push(`(${options})`);
-        }
         if (node.into && node.into.skipData) {
             output.push('WITH NO DATA');
         }
@@ -8895,7 +9231,7 @@ export class Deparser {
     }
     aliasname(node, context) {
         if (typeof node === 'string') {
-            return QuoteUtils.quote(node);
+            return QuoteUtils.quoteIdentifier(node);
         }
         return this.visit(node, context);
     }
@@ -8927,18 +9263,16 @@ export class Deparser {
                             const defName = defElem.defname;
                             const defValue = defElem.arg;
                             if (defName && defValue) {
-                                let preservedDefName;
-                                if (Deparser.needsQuotes(defName)) {
-                                    preservedDefName = `"${defName}"`;
-                                }
-                                else {
-                                    preservedDefName = this.preserveOperatorDefElemCase(defName);
-                                }
+                                const quotedDefName = QuoteUtils.quoteIdentifier(defName);
+                                const preservedDefName = quotedDefName !== defName ? quotedDefName : this.preserveOperatorDefElemCase(defName);
                                 if ((defName.toLowerCase() === 'commutator' || defName.toLowerCase() === 'negator') && defValue.List) {
                                     const listItems = ListUtils.unwrapList(defValue.List.items);
                                     if (listItems.length === 1 && listItems[0].String) {
                                         return `${preservedDefName} = ${listItems[0].String.sval}`;
                                     }
+                                    if (listItems.length > 1 && listItems.every(item => item.String)) {
+                                        return `${preservedDefName} = OPERATOR(${this.qualifiedOperatorName(listItems)})`;
+                                    }
                                 }
                                 // For commutator/negator, we already handled them above
                                 if ((defName.toLowerCase() === 'commutator' || defName.toLowerCase() === 'negator')) {
@@ -8949,7 +9283,7 @@ export class Deparser {
                             else if (defName && !defValue) {
                                 // Handle boolean flags like HASHES, MERGES - preserve original case
                                 if (defName === 'Hashes' || defName === 'Merges') {
-                                    return `"${defName}"`;
+                                    return QuoteUtils.quoteIdentifier(defName);
                                 }
                                 return this.preserveOperatorDefElemCase(defName).toUpperCase();
                             }
@@ -9088,16 +9422,11 @@ export class Deparser {
                             const defName = defElem.defname;
                             const defValue = defElem.arg;
                             if (defName && defValue) {
-                                let preservedDefName;
-                                if (Deparser.needsQuotes(defName)) {
-                                    preservedDefName = `"${defName}"`;
-                                }
-                                else {
-                                    preservedDefName = defName;
-                                }
+                                const quotedDefName = QuoteUtils.quoteIdentifier(defName);
+                                const preservedDefName = quotedDefName !== defName ? quotedDefName : defName;
                                 // Handle String arguments with single quotes for string literals
                                 if (defValue.String) {
-                                    return `${preservedDefName} = '${defValue.String.sval}'`;
+                                    return `${preservedDefName} = ${QuoteUtils.escape(defValue.String.sval)}`;
                                 }
                                 return `${preservedDefName} = ${this.visit(defValue, context)}`;
                             }
@@ -9220,7 +9549,7 @@ export class Deparser {
                                 // For CREATE COLLATION, ensure String nodes are quoted as string literals
                                 let valueStr;
                                 if (defValue.String) {
-                                    valueStr = `'${defValue.String.sval}'`;
+                                    valueStr = QuoteUtils.escape(defValue.String.sval);
                                 }
                                 else {
                                     valueStr = this.visit(defValue, context);
@@ -9249,7 +9578,7 @@ export class Deparser {
     AlterDatabaseStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(QuoteUtils.quote(node.dbname));
+            output.push(QuoteUtils.quoteIdentifier(node.dbname));
         }
         if (node.options && node.options.length > 0) {
             const options = ListUtils.unwrapList(node.options).map(opt => this.visit(opt, context));
@@ -9260,7 +9589,7 @@ export class Deparser {
     AlterDatabaseRefreshCollStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(QuoteUtils.quote(node.dbname));
+            output.push(QuoteUtils.quoteIdentifier(node.dbname));
         }
         output.push('REFRESH', 'COLLATION', 'VERSION');
         return output.join(' ');
@@ -9268,7 +9597,7 @@ export class Deparser {
     AlterDatabaseSetStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(QuoteUtils.quote(node.dbname));
+            output.push(QuoteUtils.quoteIdentifier(node.dbname));
         }
         if (node.setstmt) {
             const setClause = this.VariableSetStmt(node.setstmt, context);
@@ -9279,7 +9608,7 @@ export class Deparser {
     DeclareCursorStmt(node, context) {
         const output = ['DECLARE'];
         if (node.portalname) {
-            output.push(QuoteUtils.quote(node.portalname));
+            output.push(QuoteUtils.quoteIdentifier(node.portalname));
         }
         // Handle cursor options before CURSOR keyword
         const cursorOptions = [];
@@ -9321,7 +9650,7 @@ export class Deparser {
         else if (node.pubobjtype === 'PUBLICATIONOBJ_TABLES_IN_SCHEMA') {
             output.push('TABLES IN SCHEMA');
             if (node.name) {
-                output.push(QuoteUtils.quote(node.name));
+                output.push(QuoteUtils.quoteIdentifier(node.name));
             }
         }
         else if (node.pubobjtype === 'PUBLICATIONOBJ_TABLES_IN_CUR_SCHEMA') {
@@ -9340,14 +9669,14 @@ export class Deparser {
         }
         if (node.whereClause) {
             output.push('WHERE');
-            output.push(this.visit(node.whereClause, context));
+            output.push(`(${this.visit(node.whereClause, context)})`);
         }
         return output.join(' ');
     }
     CreateAmStmt(node, context) {
         const output = ['CREATE', 'ACCESS', 'METHOD'];
         if (node.amname) {
-            output.push(QuoteUtils.quote(node.amname));
+            output.push(QuoteUtils.quoteIdentifier(node.amname));
         }
         output.push('TYPE');
         switch (node.amtype) {
@@ -9407,7 +9736,7 @@ export class Deparser {
             }
         }
         if (node.tableSpaceName) {
-            output.push('TABLESPACE', QuoteUtils.quote(node.tableSpaceName));
+            output.push('TABLESPACE', QuoteUtils.quoteIdentifier(node.tableSpaceName));
         }
         return output.join(' ');
     }
@@ -9487,6 +9816,23 @@ export class Deparser {
         }
         return output.join(' ');
     }
+    quoteDefElemArg(arg, argValue) {
+        if (arg && this.getNodeType(arg) === 'String') {
+            return QuoteUtils.escape(this.getNodeData(arg).sval || '');
+        }
+        return typeof argValue === 'string' && !argValue.startsWith("'")
+            ? QuoteUtils.escape(argValue)
+            : argValue;
+    }
+    formatOptionValue(arg, argValue) {
+        if (arg && this.getNodeType(arg) === 'String') {
+            const sval = this.getNodeData(arg).sval || '';
+            return /^[a-z_][a-z0-9_]*$/.test(sval) && keywordKindOf(sval) === 'NO_KEYWORD'
+                ? sval
+                : QuoteUtils.escape(sval);
+        }
+        return argValue;
+    }
     Var(node, context) {
         if (node.varno && node.varattno) {
             return `$${node.varno}.${node.varattno}`;
@@ -9526,7 +9872,7 @@ export class Deparser {
             }
             if (node.rowexpr) {
                 output.push(',');
-                output.push(`'${this.visit(node.rowexpr, context)}'`);
+                output.push(this.visit(node.rowexpr, context));
             }
             if (node.colexprs && node.colexprs.length > 0) {
                 output.push('COLUMNS');
@@ -9543,29 +9889,44 @@ export class Deparser {
         if (node.lateral) {
             output.push('LATERAL');
         }
-        if (node.docexpr) {
-            output.push(this.visit(node.docexpr, context));
+        const args = [];
+        if (node.namespaces && node.namespaces.length > 0) {
+            const namespaces = ListUtils.unwrapList(node.namespaces).map(ns => {
+                const target = this.getNodeData(ns);
+                const uri = this.visit(target.val, context);
+                return target.name ? `${uri} AS ${QuoteUtils.quoteIdentifier(target.name)}` : `DEFAULT ${uri}`;
+            });
+            args.push(`XMLNAMESPACES(${namespaces.join(', ')}),`);
         }
         if (node.rowexpr) {
-            output.push('PASSING');
-            output.push(this.visit(node.rowexpr, context));
+            args.push(this.formatXmlTableExpr(node.rowexpr, context));
+        }
+        if (node.docexpr) {
+            args.push('PASSING');
+            args.push(this.formatXmlTableExpr(node.docexpr, context));
         }
         if (node.columns && node.columns.length > 0) {
-            output.push('COLUMNS');
-            const columns = ListUtils.unwrapList(node.columns)
+            args.push('COLUMNS');
+            args.push(ListUtils.unwrapList(node.columns)
                 .map(col => this.visit(col, context))
-                .join(', ');
-            output.push(`(${columns})`);
+                .join(', '));
         }
+        output.push(`XMLTABLE(${args.join(' ')})`);
         if (node.alias) {
             output.push(this.Alias(node.alias, context));
         }
         return output.join(' ');
     }
+    formatXmlTableExpr(expr, context) {
+        const value = this.visit(expr, context);
+        return ['A_Const', 'ColumnRef', 'ParamRef', 'FuncCall'].includes(this.getNodeType(expr))
+            ? value
+            : `(${value})`;
+    }
     RangeTableFuncCol(node, context) {
         const output = [];
         if (node.colname) {
-            output.push(QuoteUtils.quote(node.colname));
+            output.push(QuoteUtils.quoteIdentifier(node.colname));
         }
         if (node.for_ordinality) {
             output.push('FOR ORDINALITY');
@@ -9575,32 +9936,193 @@ export class Deparser {
         }
         if (node.colexpr) {
             output.push('PATH');
-            output.push(`'${this.visit(node.colexpr, context)}'`);
+            output.push(this.visit(node.colexpr, context));
         }
         if (node.coldefexpr) {
             output.push('DEFAULT');
             output.push(this.visit(node.coldefexpr, context));
         }
+        if (node.is_not_null) {
+            output.push('NOT NULL');
+        }
         return output.join(' ');
     }
+    formatJsonFormat(format) {
+        if (!format || !format.format_type || format.format_type === 'JS_FORMAT_DEFAULT') {
+            return null;
+        }
+        const parts = ['FORMAT JSON'];
+        switch (format.encoding) {
+            case 'JS_ENC_UTF8':
+                parts.push('ENCODING UTF8');
+                break;
+            case 'JS_ENC_UTF16':
+                parts.push('ENCODING UTF16');
+                break;
+            case 'JS_ENC_UTF32':
+                parts.push('ENCODING UTF32');
+                break;
+        }
+        return parts.join(' ');
+    }
+    formatJsonOutput(output, context) {
+        if (!output || !output.typeName)
+            return null;
+        const parts = ['RETURNING', this.TypeName(output.typeName, context)];
+        const format = this.formatJsonFormat(output.returning?.format);
+        if (format)
+            parts.push(format);
+        return parts.join(' ');
+    }
+    formatJsonNullClause(absentOnNull) {
+        return absentOnNull ? 'ABSENT ON NULL' : 'NULL ON NULL';
+    }
+    formatJsonUniqueClause(unique) {
+        return unique ? 'WITH UNIQUE KEYS' : null;
+    }
+    JsonValueExpr(node, context) {
+        const parts = [];
+        if (node.raw_expr) {
+            parts.push(this.visit(node.raw_expr, context));
+        }
+        const format = this.formatJsonFormat(node.format);
+        if (format)
+            parts.push(format);
+        return parts.join(' ');
+    }
+    JsonKeyValue(node, context) {
+        const key = node.key ? this.visit(node.key, context) : '';
+        const value = node.value ? this.JsonValueExpr(node.value, context) : '';
+        return `${key} : ${value}`;
+    }
+    JsonObjectConstructor(node, context) {
+        const args = [];
+        if (node.exprs && node.exprs.length > 0) {
+            args.push(ListUtils.unwrapList(node.exprs).map(e => this.visit(e, context)).join(', '));
+            args.push(this.formatJsonNullClause(node.absent_on_null));
+            const unique = this.formatJsonUniqueClause(node.unique);
+            if (unique)
+                args.push(unique);
+        }
+        const output = this.formatJsonOutput(node.output, context);
+        if (output)
+            args.push(output);
+        return `JSON_OBJECT(${args.join(' ')})`;
+    }
+    JsonArrayConstructor(node, context) {
+        const args = [];
+        if (node.exprs && node.exprs.length > 0) {
+            args.push(ListUtils.unwrapList(node.exprs).map(e => this.visit(e, context)).join(', '));
+            args.push(this.formatJsonNullClause(node.absent_on_null));
+        }
+        const output = this.formatJsonOutput(node.output, context);
+        if (output)
+            args.push(output);
+        return `JSON_ARRAY(${args.join(' ')})`;
+    }
     JsonArrayQueryConstructor(node, context) {
-        const output = ['JSON_ARRAYAGG'];
+        const args = [];
         if (node.query) {
-            output.push(`(${this.visit(node.query, context)})`);
+            args.push(this.visit(node.query, context));
+        }
+        const format = this.formatJsonFormat(node.format);
+        if (format)
+            args.push(format);
+        const output = this.formatJsonOutput(node.output, context);
+        if (output)
+            args.push(output);
+        return `JSON_ARRAY(${args.join(' ')})`;
+    }
+    formatJsonAggSuffix(ctor, context) {
+        if (!ctor)
+            return '';
+        let result = '';
+        if (ctor.agg_filter) {
+            result += ` FILTER (WHERE ${this.visit(ctor.agg_filter, context)})`;
         }
-        if (node.format) {
-            output.push('FORMAT JSON');
+        if (ctor.over) {
+            result += this.formatOverClause(ctor.over, context);
         }
-        if (node.output) {
-            output.push('RETURNING TEXT');
+        return result;
+    }
+    JsonObjectAgg(node, context) {
+        const args = [];
+        if (node.arg) {
+            args.push(this.JsonKeyValue(node.arg, context));
+        }
+        args.push(this.formatJsonNullClause(node.absent_on_null));
+        const unique = this.formatJsonUniqueClause(node.unique);
+        if (unique)
+            args.push(unique);
+        const output = this.formatJsonOutput(node.constructor?.output, context);
+        if (output)
+            args.push(output);
+        return `JSON_OBJECTAGG(${args.join(' ')})${this.formatJsonAggSuffix(node.constructor, context)}`;
+    }
+    JsonArrayAgg(node, context) {
+        const args = [];
+        if (node.arg) {
+            args.push(this.JsonValueExpr(node.arg, context));
         }
-        if (node.absent_on_null) {
-            output.push('ABSENT ON NULL');
+        const aggOrder = node.constructor?.agg_order;
+        if (aggOrder && aggOrder.length > 0) {
+            const orderItems = ListUtils.unwrapList(aggOrder).map(item => this.visit(item, context));
+            args.push(`ORDER BY ${orderItems.join(', ')}`);
         }
-        else {
-            output.push('NULL ON NULL');
+        args.push(this.formatJsonNullClause(node.absent_on_null));
+        const output = this.formatJsonOutput(node.constructor?.output, context);
+        if (output)
+            args.push(output);
+        return `JSON_ARRAYAGG(${args.join(' ')})${this.formatJsonAggSuffix(node.constructor, context)}`;
+    }
+    JsonParseExpr(node, context) {
+        const args = [];
+        if (node.expr) {
+            args.push(this.JsonValueExpr(node.expr, context));
         }
-        return output.join(' ');
+        const unique = this.formatJsonUniqueClause(node.unique_keys);
+        if (unique)
+            args.push(unique);
+        return `JSON(${args.join(' ')})`;
+    }
+    JsonScalarExpr(node, context) {
+        const expr = node.expr ? this.visit(node.expr, context) : '';
+        return `JSON_SCALAR(${expr})`;
+    }
+    JsonSerializeExpr(node, context) {
+        const args = [];
+        if (node.expr) {
+            args.push(this.JsonValueExpr(node.expr, context));
+        }
+        const output = this.formatJsonOutput(node.output, context);
+        if (output)
+            args.push(output);
+        return `JSON_SERIALIZE(${args.join(' ')})`;
+    }
+    JsonIsPredicate(node, context) {
+        const parts = [];
+        if (node.expr) {
+            parts.push(this.visit(node.expr, context));
+        }
+        const format = this.formatJsonFormat(node.format);
+        if (format)
+            parts.push(format);
+        parts.push('IS JSON');
+        switch (node.item_type) {
+            case 'JS_TYPE_OBJECT':
+                parts.push('OBJECT');
+                break;
+            case 'JS_TYPE_ARRAY':
+                parts.push('ARRAY');
+                break;
+            case 'JS_TYPE_SCALAR':
+                parts.push('SCALAR');
+                break;
+        }
+        if (node.unique_keys) {
+            parts.push('WITH UNIQUE KEYS');
+        }
+        return parts.join(' ');
     }
     RangeFunction(node, context) {
         const output = [];
@@ -9711,10 +10233,10 @@ export class Deparser {
         if (node.op === 'IS_XMLPI') {
             if (node.name && node.args && node.args.length > 0) {
                 const argStrs = ListUtils.unwrapList(node.args).map(arg => this.visit(arg, context));
-                return `xmlpi(name ${QuoteUtils.quote(node.name)}, ${argStrs.join(', ')})`;
+                return `xmlpi(name ${QuoteUtils.quoteIdentifier(node.name)}, ${argStrs.join(', ')})`;
             }
             else if (node.name) {
-                return `xmlpi(name ${QuoteUtils.quote(node.name)})`;
+                return `xmlpi(name ${QuoteUtils.quoteIdentifier(node.name)})`;
             }
             else {
                 return 'XMLPI()';
@@ -9729,7 +10251,7 @@ export class Deparser {
                 output.push('XMLELEMENT');
                 const elementParts = [];
                 if (node.name) {
-                    elementParts.push(`NAME ${QuoteUtils.quote(node.name)}`);
+                    elementParts.push(`NAME ${QuoteUtils.quoteIdentifier(node.name)}`);
                 }
                 if (node.named_args && node.named_args.length > 0) {
                     const namedArgStrs = ListUtils.unwrapList(node.named_args).map(arg => this.visit(arg, context));
@@ -9794,6 +10316,7 @@ export class Deparser {
                                 rootParts.push('STANDALONE NO VALUE');
                             }
                             else if (standaloneArg.A_Const.ival.ival === 3) {
+                                // STANDALONE omitted
                             }
                             else if (Object.keys(standaloneArg.A_Const.ival).length === 0) {
                                 rootParts.push('STANDALONE YES');
@@ -9829,7 +10352,7 @@ export class Deparser {
         // Handle name and args for operations that don't have special handling
         if (node.op !== 'IS_XMLELEMENT' && node.op !== 'IS_XMLPARSE' && node.op !== 'IS_XMLROOT' && node.op !== 'IS_DOCUMENT') {
             if (node.name) {
-                const quotedName = QuoteUtils.quote(node.name);
+                const quotedName = QuoteUtils.quoteIdentifier(node.name);
                 output.push(`NAME ${quotedName}`);
             }
             if (node.args && node.args.length > 0) {
@@ -9850,26 +10373,26 @@ export class Deparser {
     }
     schemaname(node, context) {
         if (typeof node === 'string') {
-            return QuoteUtils.quote(node);
+            return QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return QuoteUtils.quote(node.String.sval);
+            return QuoteUtils.quoteIdentifier(node.String.sval);
         }
         // Handle other node types without recursion
         if (node && typeof node === 'object') {
             if (node.sval !== undefined) {
-                return QuoteUtils.quote(node.sval);
+                return QuoteUtils.quoteIdentifier(node.sval);
             }
             // Handle List nodes that might contain schema names
             if (node.List && Array.isArray(node.List.items)) {
                 const items = node.List.items;
                 if (items.length > 0 && items[0].String && items[0].String.sval) {
-                    return QuoteUtils.quote(items[0].String.sval);
+                    return QuoteUtils.quoteIdentifier(items[0].String.sval);
                 }
             }
             // For other complex nodes, try to extract string value without recursion
             if (node.val !== undefined) {
-                return QuoteUtils.quote(node.val);
+                return QuoteUtils.quoteIdentifier(node.val);
             }
             return '';
         }
@@ -9932,7 +10455,7 @@ export class Deparser {
         }
         output.push('RULE');
         if (node.rulename) {
-            output.push(QuoteUtils.quote(node.rulename));
+            output.push(QuoteUtils.quoteIdentifier(node.rulename));
         }
         output.push('AS ON');
         if (node.event) {
@@ -9999,42 +10522,42 @@ export class Deparser {
     }
     relname(node, context) {
         if (typeof node === 'string') {
-            return QuoteUtils.quote(node);
+            return QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return QuoteUtils.quote(node.String.sval);
+            return QuoteUtils.quoteIdentifier(node.String.sval);
         }
         if (node && typeof node === 'object' && node.relname) {
-            return QuoteUtils.quote(node.relname);
+            return QuoteUtils.quoteIdentifier(node.relname);
         }
         return this.visit(node, context);
     }
     rel(node, context) {
         if (typeof node === 'string') {
-            return QuoteUtils.quote(node);
+            return QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return QuoteUtils.quote(node.String.sval);
+            return QuoteUtils.quoteIdentifier(node.String.sval);
         }
         if (node && node.RangeVar) {
             return this.RangeVar(node.RangeVar, context);
         }
         if (node && typeof node === 'object' && node.relname) {
-            return QuoteUtils.quote(node.relname);
+            return QuoteUtils.quoteIdentifier(node.relname);
         }
         return this.visit(node, context);
     }
     objname(node, context) {
         if (typeof node === 'string') {
-            return QuoteUtils.quote(node);
+            return QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return QuoteUtils.quote(node.String.sval);
+            return QuoteUtils.quoteIdentifier(node.String.sval);
         }
         if (Array.isArray(node)) {
             const parts = node.map(part => {
                 if (part && part.String && part.String.sval) {
-                    return QuoteUtils.quote(part.String.sval);
+                    return QuoteUtils.quoteIdentifier(part.String.sval);
                 }
                 return this.visit(part, context);
             });
@@ -10105,7 +10628,7 @@ export class Deparser {
     CurrentOfExpr(node, context) {
         const output = ['CURRENT OF'];
         if (node.cursor_name) {
-            output.push(QuoteUtils.quote(node.cursor_name));
+            output.push(QuoteUtils.quoteIdentifier(node.cursor_name));
         }
         if (node.cursor_param > 0) {
             output.push(`$${node.cursor_param}`);
@@ -10168,66 +10691,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');
@@ -10242,7 +10711,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const domainName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(domainName)}`);
+                    output.push(QuoteUtils.quoteQualifiedIdentifier(schemaName, domainName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10254,7 +10723,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const typeName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(typeName)}`);
+                    output.push(QuoteUtils.quoteQualifiedIdentifier(schemaName, typeName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10266,7 +10735,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const conversionName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(conversionName)}`);
+                    output.push(QuoteUtils.quoteQualifiedIdentifier(schemaName, conversionName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10278,7 +10747,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const parserName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(parserName)}`);
+                    output.push(QuoteUtils.quoteQualifiedIdentifier(schemaName, parserName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10290,7 +10759,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const configName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(configName)}`);
+                    output.push(QuoteUtils.quoteQualifiedIdentifier(schemaName, configName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10302,7 +10771,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const templateName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(templateName)}`);
+                    output.push(QuoteUtils.quoteQualifiedIdentifier(schemaName, templateName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10314,7 +10783,7 @@ export class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const dictionaryName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(dictionaryName)}`);
+                    output.push(QuoteUtils.quoteQualifiedIdentifier(schemaName, dictionaryName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10326,13 +10795,13 @@ export class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const opClassName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(opClassName)} USING ${accessMethod}`);
+                    output.push(`${QuoteUtils.quoteIdentifier(opClassName)} USING ${accessMethod}`);
                 }
                 else if (items.length === 3) {
                     const accessMethod = items[0].String?.sval || '';
                     const schemaName = items[1].String?.sval || '';
                     const opClassName = items[2].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(opClassName)} USING ${accessMethod}`);
+                    output.push(`${QuoteUtils.quoteQualifiedIdentifier(schemaName, opClassName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10344,13 +10813,13 @@ export class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const opFamilyName = items[1].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(opFamilyName)} USING ${accessMethod}`);
+                    output.push(`${QuoteUtils.quoteIdentifier(opFamilyName)} USING ${accessMethod}`);
                 }
                 else if (items.length === 3) {
                     const accessMethod = items[0].String?.sval || '';
                     const schemaName = items[1].String?.sval || '';
                     const opFamilyName = items[2].String?.sval || '';
-                    output.push(`${QuoteUtils.quote(schemaName)}.${QuoteUtils.quote(opFamilyName)} USING ${accessMethod}`);
+                    output.push(`${QuoteUtils.quoteQualifiedIdentifier(schemaName, opFamilyName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10362,7 +10831,7 @@ export class Deparser {
         }
         output.push('SET SCHEMA');
         if (node.newschema) {
-            output.push(QuoteUtils.quote(node.newschema));
+            output.push(QuoteUtils.quoteIdentifier(node.newschema));
         }
         return output.join(' ');
     }
@@ -10431,7 +10900,7 @@ export class Deparser {
         }
         if (node.servername) {
             output.push('SERVER');
-            output.push(QuoteUtils.quote(node.servername));
+            output.push(QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             const foreignTableContext = context.spawn('CreateForeignTableStmt');
@@ -10440,8 +10909,4 @@ export class Deparser {
         }
         return output.join(' ');
     }
-    containsMultilineStringLiteral(content) {
-        const stringLiteralRegex = /'[^']*\n[^']*'/g;
-        return stringLiteralRegex.test(content);
-    }
 }