pgsql-deparser 17.12.2 → 17.14.0

package/esm/deparser.js

@@ -1188,12 +1188,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);
                 });
@@ -1205,12 +1205,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);
                 });
@@ -1223,7 +1223,7 @@ export class Deparser {
             }
             if (node.name) {
                 output.push('AS');
-                output.push(QuoteUtils.quote(node.name));
+                output.push(QuoteUtils.quoteIdentifier(node.name));
             }
         }
         return output.join(' ');
@@ -1237,7 +1237,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 {
@@ -1292,7 +1292,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);
@@ -1674,7 +1675,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 '*';
@@ -1751,8 +1752,7 @@ export class Deparser {
                 }
                 return output.join(' ');
             }
-            const quotedTypeName = QuoteUtils.quote(typeName);
-            let result = mods(quotedTypeName, args);
+            let result = mods(typeName, args);
             if (node.arrayBounds && node.arrayBounds.length > 0) {
                 result += formatArrayBounds(node.arrayBounds);
             }
@@ -1848,7 +1848,7 @@ export class Deparser {
                 return output.join(' ');
             }
         }
-        const quotedNames = names.map((name) => QuoteUtils.quote(name));
+        const quotedNames = names.map((name) => QuoteUtils.quoteIdentifier(name));
         let result = mods(quotedNames.join('.'), args);
         if (node.arrayBounds && node.arrayBounds.length > 0) {
             result += formatArrayBounds(node.arrayBounds);
@@ -1887,17 +1887,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) {
@@ -2123,7 +2123,7 @@ export class Deparser {
         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 {
@@ -2268,32 +2268,8 @@ 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 = {
@@ -2326,7 +2302,7 @@ 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';
@@ -2503,7 +2479,7 @@ 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));
@@ -2544,7 +2520,7 @@ export class Deparser {
         // Handle constraint name if present
         if (node.conname && (node.contype === 'CONSTR_CHECK' || node.contype === 'CONSTR_UNIQUE' || node.contype === 'CONSTR_PRIMARY' || node.contype === 'CONSTR_FOREIGN')) {
             output.push('CONSTRAINT');
-            output.push(QuoteUtils.quote(node.conname));
+            output.push(QuoteUtils.quoteIdentifier(node.conname));
         }
         switch (node.contype) {
             case 'CONSTR_NULL':
@@ -3441,7 +3417,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) {
@@ -3475,14 +3451,14 @@ export class Deparser {
         }
         if (node.tableSpace) {
             output.push('TABLESPACE');
-            output.push(QuoteUtils.quote(node.tableSpace));
+            output.push(QuoteUtils.quoteIdentifier(node.tableSpace));
         }
         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)));
@@ -3533,7 +3509,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)));
@@ -3783,19 +3759,19 @@ 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':
@@ -3892,16 +3868,16 @@ export class Deparser {
                     return this.visit(arg, context);
                 }).join(', ') : '';
                 // 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;
+                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') {
@@ -3975,7 +3951,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';
@@ -4244,7 +4220,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());
@@ -4278,13 +4254,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('.');
                     }
@@ -4327,7 +4303,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());
@@ -4375,7 +4351,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))
@@ -4524,7 +4500,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));
@@ -4582,7 +4558,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));
@@ -4636,7 +4612,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');
@@ -4653,7 +4629,7 @@ 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) {
@@ -4680,7 +4656,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':
@@ -4698,7 +4674,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');
@@ -4736,7 +4712,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');
@@ -4749,7 +4725,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) {
@@ -4760,7 +4736,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':
@@ -4787,21 +4763,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());
@@ -4814,7 +4790,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) {
@@ -4831,7 +4807,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) {
@@ -4848,7 +4824,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) {
@@ -4858,31 +4834,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':
@@ -4900,31 +4876,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
@@ -4978,7 +4954,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');
@@ -4991,7 +4967,7 @@ 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) {
@@ -5001,14 +4977,14 @@ export class Deparser {
                 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));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET NOT NULL');
                     break;
@@ -5041,7 +5017,7 @@ export class Deparser {
                     if (node.def && this.getNodeType(node.def) === 'Constraint') {
                         const constraintData = this.getNodeData(node.def);
                         if (constraintData.conname) {
-                            output.push(QuoteUtils.quote(constraintData.conname));
+                            output.push(QuoteUtils.quoteIdentifier(constraintData.conname));
                             if (constraintData.deferrable !== undefined) {
                                 output.push(constraintData.deferrable ? 'DEFERRABLE' : 'NOT DEFERRABLE');
                             }
@@ -5051,7 +5027,7 @@ export class Deparser {
                         }
                     }
                     else if (node.name) {
-                        output.push(QuoteUtils.quote(node.name));
+                        output.push(QuoteUtils.quoteIdentifier(node.name));
                         if (node.def) {
                             output.push(this.visit(node.def, context));
                         }
@@ -5072,7 +5048,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) {
@@ -5126,7 +5102,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) {
@@ -5136,7 +5112,7 @@ 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) {
@@ -5146,7 +5122,7 @@ export class Deparser {
                 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') {
@@ -5180,7 +5156,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) => {
@@ -5285,7 +5262,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));
@@ -5357,7 +5334,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) {
@@ -5399,7 +5376,7 @@ export class Deparser {
         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();
         }
@@ -5421,9 +5398,7 @@ export class Deparser {
                     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 quotedDefname = QuoteUtils.quoteIdentifier(node.defname);
                     if (node.defaction === 'DEFELEM_ADD') {
                         return `ADD ${quotedDefname} ${finalValue}`;
                     }
@@ -5447,9 +5422,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') {
@@ -5509,9 +5482,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')) {
@@ -5586,10 +5557,7 @@ export class Deparser {
                             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);
                         });
@@ -5837,13 +5805,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);
@@ -5903,7 +5871,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();
@@ -6087,7 +6055,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:
@@ -6146,7 +6114,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');
@@ -6155,7 +6123,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':
@@ -6172,7 +6140,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');
@@ -6181,7 +6149,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':
@@ -6570,7 +6538,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
@@ -6647,7 +6615,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');
@@ -6683,7 +6651,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');
@@ -6731,7 +6699,7 @@ 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');
@@ -6751,7 +6719,7 @@ 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) {
@@ -6772,7 +6740,7 @@ 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) {
@@ -6807,7 +6775,7 @@ export class Deparser {
     AlterSubscriptionStmt(node, context) {
         const output = ['ALTER', 'SUBSCRIPTION'];
         if (node.subname) {
-            output.push(`"${node.subname}"`);
+            output.push(QuoteUtils.quoteIdentifier(node.subname));
         }
         if (node.kind) {
             switch (node.kind) {
@@ -6853,7 +6821,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) {
@@ -7098,7 +7066,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');
@@ -7156,7 +7124,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(' ');
     }
@@ -7226,7 +7194,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');
@@ -7247,7 +7215,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));
@@ -7256,7 +7224,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');
@@ -7271,7 +7239,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));
@@ -7296,7 +7264,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');
@@ -7320,14 +7288,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) {
@@ -7353,11 +7321,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');
@@ -7371,7 +7339,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) {
@@ -7435,7 +7403,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(' ');
     }
@@ -7475,7 +7443,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))
@@ -7492,7 +7460,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))
@@ -7590,7 +7558,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':
@@ -7648,7 +7616,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));
         }
@@ -7667,7 +7635,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));
@@ -7688,19 +7656,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');
@@ -7714,7 +7682,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');
@@ -7737,7 +7705,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));
@@ -8007,7 +7975,7 @@ export class Deparser {
     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) {
@@ -8160,7 +8128,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');
@@ -8196,7 +8164,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 = [];
@@ -8224,7 +8192,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 = [];
@@ -8388,14 +8356,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) {
@@ -8421,7 +8389,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) {
@@ -8556,11 +8524,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');
@@ -8584,10 +8552,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('.'));
         }
@@ -8621,10 +8589,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('.'));
         }
@@ -8971,7 +8939,7 @@ export class Deparser {
     }
     aliasname(node, context) {
         if (typeof node === 'string') {
-            return QuoteUtils.quote(node);
+            return QuoteUtils.quoteIdentifier(node);
         }
         return this.visit(node, context);
     }
@@ -9003,13 +8971,8 @@ 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) {
@@ -9025,7 +8988,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();
                             }
@@ -9164,13 +9127,8 @@ 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}'`;
@@ -9325,7 +9283,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));
@@ -9336,7 +9294,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(' ');
@@ -9344,7 +9302,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);
@@ -9355,7 +9313,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 = [];
@@ -9397,7 +9355,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') {
@@ -9423,7 +9381,7 @@ export class Deparser {
     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) {
@@ -9483,7 +9441,7 @@ export class Deparser {
             }
         }
         if (node.tableSpaceName) {
-            output.push('TABLESPACE', QuoteUtils.quote(node.tableSpaceName));
+            output.push('TABLESPACE', QuoteUtils.quoteIdentifier(node.tableSpaceName));
         }
         return output.join(' ');
     }
@@ -9641,7 +9599,7 @@ export class Deparser {
     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');
@@ -9787,10 +9745,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()';
@@ -9805,7 +9763,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));
@@ -9905,7 +9863,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) {
@@ -9926,26 +9884,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 '';
         }
@@ -10008,7 +9966,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) {
@@ -10075,42 +10033,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);
             });
@@ -10181,7 +10139,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}`);
@@ -10264,7 +10222,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));
@@ -10276,7 +10234,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));
@@ -10288,7 +10246,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));
@@ -10300,7 +10258,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));
@@ -10312,7 +10270,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));
@@ -10324,7 +10282,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));
@@ -10336,7 +10294,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));
@@ -10348,13 +10306,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));
@@ -10366,13 +10324,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));
@@ -10384,7 +10342,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(' ');
     }
@@ -10453,7 +10411,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');