npm - pgsql-deparser - Versions diffs - 17.12.2 → 17.14.0 - Mend

pgsql-deparser 17.12.2 → 17.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/README.md +1 -1
package/deparser.d.ts +0 -2
package/deparser.js +183 -225
package/esm/deparser.js +183 -225
package/esm/kwlist.js +531 -0
package/esm/utils/quote-utils.js +136 -46
package/kwlist.d.ts +16 -0
package/kwlist.js +535 -0
package/package.json +4 -3
package/utils/quote-utils.d.ts +47 -2
package/utils/quote-utils.js +136 -46

package/deparser.js CHANGED Viewed

@@ -1191,12 +1191,12 @@ class Deparser {
     ResTarget(node, context) {
         const output = [];
         if (context.update && node.name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
             // Handle indirection (array indexing, field access, etc.)
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStrs = list_utils_1.ListUtils.unwrapList(node.indirection).map(item => {
                     if (item.String) {
-                        return `.${quote_utils_1.QuoteUtils.quote(item.String.sval || item.String.str)}`;
+                        return `.${quote_utils_1.QuoteUtils.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
                     }
                     return this.visit(item, context);
                 });
@@ -1208,12 +1208,12 @@ class Deparser {
             }
         }
         else if (context.insertColumns && node.name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
             // Handle indirection for INSERT column lists (e.g., q.c1.r)
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStrs = list_utils_1.ListUtils.unwrapList(node.indirection).map(item => {
                     if (item.String) {
-                        return `.${quote_utils_1.QuoteUtils.quote(item.String.sval || item.String.str)}`;
+                        return `.${quote_utils_1.QuoteUtils.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
                     }
                     return this.visit(item, context);
                 });
@@ -1226,7 +1226,7 @@ class Deparser {
             }
             if (node.name) {
                 output.push('AS');
-                output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
             }
         }
         return output.join(' ');
@@ -1240,7 +1240,7 @@ 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 ${quote_utils_1.QuoteUtils.quote(resTarget.name)}` : '';
+                    const alias = resTarget.name ? ` AS ${quote_utils_1.QuoteUtils.quoteIdentifier(resTarget.name)}` : '';
                     return val + alias;
                 }
                 else {
@@ -1295,7 +1295,8 @@ class Deparser {
     FuncCall(node, context) {
         const funcname = list_utils_1.ListUtils.unwrapList(node.funcname);
         const args = list_utils_1.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 = quote_utils_1.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);
@@ -1677,7 +1678,7 @@ class Deparser {
         const fields = list_utils_1.ListUtils.unwrapList(node.fields);
         return fields.map(field => {
             if (field.String) {
-                return quote_utils_1.QuoteUtils.quote(field.String.sval || field.String.str);
+                return quote_utils_1.QuoteUtils.quoteIdentifier(field.String.sval || field.String.str);
             }
             else if (field.A_Star) {
                 return '*';
@@ -1754,8 +1755,7 @@ class Deparser {
                 }
                 return output.join(' ');
             }
-            const quotedTypeName = quote_utils_1.QuoteUtils.quote(typeName);
-            let result = mods(quotedTypeName, args);
+            let result = mods(typeName, args);
             if (node.arrayBounds && node.arrayBounds.length > 0) {
                 result += formatArrayBounds(node.arrayBounds);
             }
@@ -1851,7 +1851,7 @@ class Deparser {
                 return output.join(' ');
             }
         }
-        const quotedNames = names.map((name) => quote_utils_1.QuoteUtils.quote(name));
+        const quotedNames = names.map((name) => quote_utils_1.QuoteUtils.quoteIdentifier(name));
         let result = mods(quotedNames.join('.'), args);
         if (node.arrayBounds && node.arrayBounds.length > 0) {
             result += formatArrayBounds(node.arrayBounds);
@@ -1890,17 +1890,17 @@ class Deparser {
         }
         let tableName = '';
         if (node.catalogname) {
-            tableName = quote_utils_1.QuoteUtils.quote(node.catalogname);
+            tableName = quote_utils_1.QuoteUtils.quoteIdentifier(node.catalogname);
             if (node.schemaname) {
-                tableName += '.' + quote_utils_1.QuoteUtils.quote(node.schemaname);
+                tableName += '.' + quote_utils_1.QuoteUtils.quoteIdentifierAfterDot(node.schemaname);
             }
-            tableName += '.' + quote_utils_1.QuoteUtils.quote(node.relname);
+            tableName += '.' + quote_utils_1.QuoteUtils.quoteIdentifierAfterDot(node.relname);
         }
         else if (node.schemaname) {
-            tableName = quote_utils_1.QuoteUtils.quote(node.schemaname) + '.' + quote_utils_1.QuoteUtils.quote(node.relname);
+            tableName = quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(node.schemaname, node.relname);
         }
         else {
-            tableName = quote_utils_1.QuoteUtils.quote(node.relname);
+            tableName = quote_utils_1.QuoteUtils.quoteIdentifier(node.relname);
         }
         output.push(tableName);
         if (node.alias) {
@@ -2126,7 +2126,7 @@ class Deparser {
         const indirection = list_utils_1.ListUtils.unwrapList(node.indirection);
         for (const subnode of indirection) {
             if (subnode.String || subnode.A_Star) {
-                const value = subnode.A_Star ? '*' : quote_utils_1.QuoteUtils.quote(subnode.String.sval || subnode.String.str);
+                const value = subnode.A_Star ? '*' : quote_utils_1.QuoteUtils.quoteIdentifier(subnode.String.sval || subnode.String.str);
                 output.push(`.${value}`);
             }
             else {
@@ -2271,32 +2271,8 @@ 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 quote_utils_1.QuoteUtils.quoteIdentifier(value);
     }
     preserveOperatorDefElemCase(defName) {
         const caseMap = {
@@ -2329,7 +2305,7 @@ class Deparser {
                 return value; // Don't quote pure operator symbols like "=" or "-"
             }
         }
-        return Deparser.needsQuotes(value) ? `"${value}"` : value;
+        return quote_utils_1.QuoteUtils.quoteIdentifier(value);
     }
     Integer(node, context) {
         return node.ival?.toString() || '0';
@@ -2506,7 +2482,7 @@ class Deparser {
     ColumnDef(node, context) {
         const output = [];
         if (node.colname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.colname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.colname));
         }
         if (node.typeName) {
             output.push(this.TypeName(node.typeName, context));
@@ -2547,7 +2523,7 @@ 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(quote_utils_1.QuoteUtils.quote(node.conname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.conname));
         }
         switch (node.contype) {
             case 'CONSTR_NULL':
@@ -3444,7 +3420,7 @@ class Deparser {
             output.push('IF NOT EXISTS');
         }
         if (node.idxname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.idxname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.idxname));
         }
         output.push('ON');
         if (node.relation) {
@@ -3478,14 +3454,14 @@ class Deparser {
         }
         if (node.tableSpace) {
             output.push('TABLESPACE');
-            output.push(quote_utils_1.QuoteUtils.quote(node.tableSpace));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.tableSpace));
         }
         return output.join(' ');
     }
     IndexElem(node, context) {
         const output = [];
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
         }
         else if (node.expr) {
             output.push(context.parens(this.visit(node.expr, context)));
@@ -3536,7 +3512,7 @@ class Deparser {
     PartitionElem(node, context) {
         const output = [];
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
         }
         else if (node.expr) {
             output.push(context.parens(this.visit(node.expr, context)));
@@ -3786,19 +3762,19 @@ class Deparser {
             case 'TRANS_STMT_SAVEPOINT':
                 output.push('SAVEPOINT');
                 if (node.savepoint_name) {
-                    output.push(quote_utils_1.QuoteUtils.quote(node.savepoint_name));
+                    output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.savepoint_name));
                 }
                 break;
             case 'TRANS_STMT_RELEASE':
                 output.push('RELEASE SAVEPOINT');
                 if (node.savepoint_name) {
-                    output.push(quote_utils_1.QuoteUtils.quote(node.savepoint_name));
+                    output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.savepoint_name));
                 }
                 break;
             case 'TRANS_STMT_ROLLBACK_TO':
                 output.push('ROLLBACK TO');
                 if (node.savepoint_name) {
-                    output.push(quote_utils_1.QuoteUtils.quote(node.savepoint_name));
+                    output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.savepoint_name));
                 }
                 break;
             case 'TRANS_STMT_PREPARE':
@@ -3895,16 +3871,16 @@ 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 = quote_utils_1.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 = quote_utils_1.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 = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
                 return `SET ${currentParamName} FROM CURRENT`;
             case 'VAR_SET_MULTI':
                 if (node.name === 'TRANSACTION' || node.name === 'SESSION CHARACTERISTICS') {
@@ -3978,7 +3954,7 @@ 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 = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
                 return `RESET ${resetParamName}`;
             case 'VAR_RESET_ALL':
                 return 'RESET ALL';
@@ -4247,7 +4223,7 @@ class Deparser {
                     if (objList && objList.List && objList.List.items) {
                         const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
-                                return quote_utils_1.QuoteUtils.quote(item.String.sval);
+                                return quote_utils_1.QuoteUtils.quoteIdentifier(item.String.sval);
                             }
                             return this.visit(item, context);
                         }).filter((name) => name && name.trim());
@@ -4281,13 +4257,13 @@ class Deparser {
                         if (items.length === 2) {
                             const accessMethod = items[0];
                             const objectName = items[1];
-                            return `${quote_utils_1.QuoteUtils.quote(objectName)} USING ${accessMethod}`;
+                            return `${quote_utils_1.QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`;
                         }
                         else if (items.length === 3) {
                             const accessMethod = items[0];
                             const schemaName = items[1];
                             const objectName = items[2];
-                            return `${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(objectName)} USING ${accessMethod}`;
+                            return `${quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, objectName)} USING ${accessMethod}`;
                         }
                         return items.join('.');
                     }
@@ -4330,7 +4306,7 @@ class Deparser {
                     if (objList && objList.List && objList.List.items) {
                         const items = objList.List.items.map((item) => {
                             if (item.String && item.String.sval) {
-                                return quote_utils_1.QuoteUtils.quote(item.String.sval);
+                                return quote_utils_1.QuoteUtils.quoteIdentifier(item.String.sval);
                             }
                             return this.visit(item, context);
                         }).filter((name) => name && name.trim());
@@ -4378,7 +4354,7 @@ class Deparser {
     PLAssignStmt(node, context) {
         const output = [];
         if (node.name) {
-            let nameWithIndirection = quote_utils_1.QuoteUtils.quote(node.name);
+            let nameWithIndirection = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStr = node.indirection
                     .map((ind) => this.visit(ind, context))
@@ -4527,7 +4503,7 @@ class Deparser {
                             const parts = [];
                             const indentedParts = [];
                             if (colDefData.colname) {
-                                parts.push(quote_utils_1.QuoteUtils.quote(colDefData.colname));
+                                parts.push(quote_utils_1.QuoteUtils.quoteIdentifier(colDefData.colname));
                             }
                             if (colDefData.typeName) {
                                 parts.push(this.TypeName(colDefData.typeName, context));
@@ -4585,7 +4561,7 @@ class Deparser {
                         else {
                             const parts = [];
                             if (colDefData.colname) {
-                                parts.push(quote_utils_1.QuoteUtils.quote(colDefData.colname));
+                                parts.push(quote_utils_1.QuoteUtils.quoteIdentifier(colDefData.colname));
                             }
                             if (colDefData.typeName) {
                                 parts.push(this.TypeName(colDefData.typeName, context));
@@ -4639,7 +4615,7 @@ class Deparser {
                         }
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -4656,7 +4632,7 @@ class Deparser {
                         output.push('ALTER COLUMN');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('TYPE');
                     if (node.def) {
@@ -4683,7 +4659,7 @@ class Deparser {
                 case 'AT_SetTableSpace':
                     output.push('SET TABLESPACE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_AddConstraint':
@@ -4701,7 +4677,7 @@ class Deparser {
                         output.push('DROP CONSTRAINT');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -4739,7 +4715,7 @@ class Deparser {
                 case 'AT_ColumnDefault':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.def) {
                         output.push('SET DEFAULT');
@@ -4752,7 +4728,7 @@ class Deparser {
                 case 'AT_SetStorage':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET STORAGE');
                     if (node.def) {
@@ -4763,7 +4739,7 @@ class Deparser {
                 case 'AT_ClusterOn':
                     output.push('CLUSTER ON');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DropCluster':
@@ -4790,21 +4766,21 @@ class Deparser {
                 case 'AT_SetNotNull':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET NOT NULL');
                     break;
                 case 'AT_DropNotNull':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP NOT NULL');
                     break;
                 case 'AT_SetStatistics':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     else if (node.num !== undefined && node.num !== null) {
                         output.push(node.num.toString());
@@ -4817,7 +4793,7 @@ class Deparser {
                 case 'AT_SetOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET');
                     if (node.def) {
@@ -4834,7 +4810,7 @@ class Deparser {
                 case 'AT_ResetOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('RESET');
                     if (node.def) {
@@ -4851,7 +4827,7 @@ class Deparser {
                 case 'AT_SetCompression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET COMPRESSION');
                     if (node.def) {
@@ -4861,31 +4837,31 @@ class Deparser {
                 case 'AT_ValidateConstraint':
                     output.push('VALIDATE CONSTRAINT');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableTrig':
                     output.push('ENABLE TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableAlwaysTrig':
                     output.push('ENABLE ALWAYS TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableReplicaTrig':
                     output.push('ENABLE REPLICA TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DisableTrig':
                     output.push('DISABLE TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableTrigAll':
@@ -4903,31 +4879,31 @@ class Deparser {
                 case 'AT_EnableRule':
                     output.push('ENABLE RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableAlwaysRule':
                     output.push('ENABLE ALWAYS RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableReplicaRule':
                     output.push('ENABLE REPLICA RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DisableRule':
                     output.push('DISABLE RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_SetAccessMethod':
                     output.push('SET ACCESS METHOD');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     else {
                         // Handle DEFAULT access method case
@@ -4981,7 +4957,7 @@ class Deparser {
                 case 'AT_CookedColumnDefault':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.def) {
                         output.push('SET DEFAULT');
@@ -4994,7 +4970,7 @@ class Deparser {
                 case 'AT_SetExpression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET EXPRESSION');
                     if (node.def) {
@@ -5004,14 +4980,14 @@ class Deparser {
                 case 'AT_DropExpression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP EXPRESSION');
                     break;
                 case 'AT_CheckNotNull':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET NOT NULL');
                     break;
@@ -5044,7 +5020,7 @@ class Deparser {
                     if (node.def && this.getNodeType(node.def) === 'Constraint') {
                         const constraintData = this.getNodeData(node.def);
                         if (constraintData.conname) {
-                            output.push(quote_utils_1.QuoteUtils.quote(constraintData.conname));
+                            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(constraintData.conname));
                             if (constraintData.deferrable !== undefined) {
                                 output.push(constraintData.deferrable ? 'DEFERRABLE' : 'NOT DEFERRABLE');
                             }
@@ -5054,7 +5030,7 @@ class Deparser {
                         }
                     }
                     else if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                         if (node.def) {
                             output.push(this.visit(node.def, context));
                         }
@@ -5075,7 +5051,7 @@ class Deparser {
                 case 'AT_AlterColumnGenericOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('OPTIONS');
                     if (node.def) {
@@ -5129,7 +5105,7 @@ class Deparser {
                 case 'AT_AddIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('ADD');
                     if (node.def) {
@@ -5139,7 +5115,7 @@ class Deparser {
                 case 'AT_SetIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET');
                     if (node.def) {
@@ -5149,7 +5125,7 @@ class Deparser {
                 case 'AT_DropIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP IDENTITY');
                     if (node.behavior === 'DROP_CASCADE') {
@@ -5183,7 +5159,8 @@ 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 = quote_utils_1.QuoteUtils.quoteDottedName(funcnameParts);
             if (node.parameters && node.parameters.length > 0) {
                 const params = node.parameters
                     .filter((param) => {
@@ -5288,7 +5265,7 @@ class Deparser {
             }
         }
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
         }
         if (node.argType) {
             output.push(this.TypeName(node.argType, context));
@@ -5360,7 +5337,7 @@ class Deparser {
             output.push('ROLE');
         }
         if (node.role) {
-            const roleName = Deparser.needsQuotes(node.role) ? `"${node.role}"` : node.role;
+            const roleName = quote_utils_1.QuoteUtils.quoteIdentifier(node.role);
             output.push(roleName);
         }
         if (node.options) {
@@ -5402,7 +5379,7 @@ 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 quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
             }
             return node.defname.charAt(0).toUpperCase() + node.defname.slice(1).toLowerCase();
         }
@@ -5424,9 +5401,7 @@ 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 = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
                     if (node.defaction === 'DEFELEM_ADD') {
                         return `ADD ${quotedDefname} ${finalValue}`;
                     }
@@ -5450,9 +5425,7 @@ 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 = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
                 return `${quotedDefname} ${quotedValue}`;
             }
             else if (node.defaction === 'DEFELEM_DROP') {
@@ -5512,9 +5485,7 @@ class Deparser {
                 const quotedValue = typeof argValue === 'string'
                     ? quote_utils_1.QuoteUtils.escape(argValue)
                     : argValue;
-                const quotedDefname = node.defname.includes(' ') || node.defname.includes('-')
-                    ? `"${node.defname}"`
-                    : node.defname;
+                const quotedDefname = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
                 return `${quotedDefname} ${quotedValue}`;
             }
             if (context.parentNodeTypes.includes('CreateRoleStmt') || context.parentNodeTypes.includes('AlterRoleStmt')) {
@@ -5589,10 +5560,7 @@ 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 quote_utils_1.QuoteUtils.quoteIdentifier(value);
                             }
                             return this.visit(item, context);
                         });
@@ -5840,13 +5808,13 @@ 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 quote_utils_1.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 = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                if (quotedDefname !== node.defname) {
                     if (node.arg) {
                         if (this.getNodeType(node.arg) === 'String') {
                             const stringData = this.getNodeData(node.arg);
@@ -5906,7 +5874,7 @@ 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 quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
             }
         }
         return node.defname.toUpperCase();
@@ -6090,7 +6058,7 @@ class Deparser {
                 case 'REPLICA_IDENTITY_INDEX':
                     output.push('USING', 'INDEX');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 default:
@@ -6149,7 +6117,7 @@ class Deparser {
                         output.push('IF', 'EXISTS');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -6158,7 +6126,7 @@ class Deparser {
                 case 'AT_ValidateConstraint':
                     output.push('VALIDATE', 'CONSTRAINT');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'C':
@@ -6175,7 +6143,7 @@ class Deparser {
                         output.push('IF', 'EXISTS');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -6184,7 +6152,7 @@ class Deparser {
                 case 'V':
                     output.push('VALIDATE', 'CONSTRAINT');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'O':
@@ -6573,7 +6541,7 @@ class Deparser {
         const output = [];
         const initialParts = ['CREATE', 'POLICY'];
         if (node.policy_name) {
-            initialParts.push(quote_utils_1.QuoteUtils.quote(node.policy_name));
+            initialParts.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.policy_name));
         }
         output.push(initialParts.join(' '));
         // Add ON clause on new line in pretty mode
@@ -6650,7 +6618,7 @@ class Deparser {
     AlterPolicyStmt(node, context) {
         const output = ['ALTER', 'POLICY'];
         if (node.policy_name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.policy_name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.policy_name));
         }
         if (node.table) {
             output.push('ON');
@@ -6686,7 +6654,7 @@ class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(`"${node.servername}"`);
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -6734,7 +6702,7 @@ class Deparser {
     CreatePublicationStmt(node, context) {
         const output = ['CREATE', 'PUBLICATION'];
         if (node.pubname) {
-            output.push(`"${node.pubname}"`);
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.pubname));
         }
         if (node.pubobjects && node.pubobjects.length > 0) {
             output.push('FOR', 'TABLE');
@@ -6754,7 +6722,7 @@ class Deparser {
     CreateSubscriptionStmt(node, context) {
         const output = ['CREATE', 'SUBSCRIPTION'];
         if (node.subname) {
-            output.push(`"${node.subname}"`);
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
         }
         output.push('CONNECTION');
         if (node.conninfo) {
@@ -6775,7 +6743,7 @@ class Deparser {
     AlterPublicationStmt(node, context) {
         const output = ['ALTER', 'PUBLICATION'];
         if (node.pubname) {
-            output.push(`"${node.pubname}"`);
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.pubname));
         }
         if (node.action) {
             switch (node.action) {
@@ -6810,7 +6778,7 @@ class Deparser {
     AlterSubscriptionStmt(node, context) {
         const output = ['ALTER', 'SUBSCRIPTION'];
         if (node.subname) {
-            output.push(`"${node.subname}"`);
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
         }
         if (node.kind) {
             switch (node.kind) {
@@ -6856,7 +6824,7 @@ class Deparser {
             output.push('IF EXISTS');
         }
         if (node.subname) {
-            output.push(`"${node.subname}"`);
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
         }
         if (node.behavior) {
             switch (node.behavior) {
@@ -7101,7 +7069,7 @@ class Deparser {
     ClosePortalStmt(node, context) {
         const output = ['CLOSE'];
         if (node.portalname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.portalname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.portalname));
         }
         else {
             output.push('ALL');
@@ -7159,7 +7127,7 @@ class Deparser {
             output.push('ALL');
         }
         if (node.portalname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.portalname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.portalname));
         }
         return output.join(' ');
     }
@@ -7229,7 +7197,7 @@ class Deparser {
     AlterFdwStmt(node, context) {
         const output = ['ALTER', 'FOREIGN', 'DATA', 'WRAPPER'];
         if (node.fdwname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.fdwname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.fdwname));
         }
         if (node.func_options && node.func_options.length > 0) {
             const fdwContext = context.spawn('AlterFdwStmt');
@@ -7250,7 +7218,7 @@ class Deparser {
             output.push('IF', 'NOT', 'EXISTS');
         }
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.servername));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.servertype) {
             output.push('TYPE', quote_utils_1.QuoteUtils.escape(node.servertype));
@@ -7259,7 +7227,7 @@ class Deparser {
             output.push('VERSION', quote_utils_1.QuoteUtils.escape(node.version));
         }
         if (node.fdwname) {
-            output.push('FOREIGN', 'DATA', 'WRAPPER', quote_utils_1.QuoteUtils.quote(node.fdwname));
+            output.push('FOREIGN', 'DATA', 'WRAPPER', quote_utils_1.QuoteUtils.quoteIdentifier(node.fdwname));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -7274,7 +7242,7 @@ class Deparser {
     AlterForeignServerStmt(node, context) {
         const output = ['ALTER', 'SERVER'];
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.servername));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.version) {
             output.push('VERSION', quote_utils_1.QuoteUtils.escape(node.version));
@@ -7299,7 +7267,7 @@ class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.servername));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -7323,14 +7291,14 @@ class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.servername));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         return output.join(' ');
     }
     ImportForeignSchemaStmt(node, context) {
         const output = ['IMPORT', 'FOREIGN', 'SCHEMA'];
         if (node.remote_schema) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.remote_schema));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.remote_schema));
         }
         if (node.list_type) {
             switch (node.list_type) {
@@ -7356,11 +7324,11 @@ class Deparser {
         }
         output.push('FROM', 'SERVER');
         if (node.server_name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.server_name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.server_name));
         }
         output.push('INTO');
         if (node.local_schema) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.local_schema));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.local_schema));
         }
         if (node.options && node.options.length > 0) {
             const importSchemaContext = context.spawn('ImportForeignSchemaStmt');
@@ -7374,7 +7342,7 @@ class Deparser {
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
             if (node.indexname) {
-                output.push('USING', `"${node.indexname}"`);
+                output.push('USING', quote_utils_1.QuoteUtils.quoteIdentifier(node.indexname));
             }
         }
         if (node.params && node.params.length > 0) {
@@ -7438,7 +7406,7 @@ class Deparser {
             output.push(this.RangeVar(node.relation, context));
         }
         if (node.name) {
-            output.push(`"${node.name}"`);
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
         }
         return output.join(' ');
     }
@@ -7478,7 +7446,7 @@ class Deparser {
         if (!node.dbname) {
             throw new Error('CreatedbStmt requires dbname');
         }
-        output.push(`"${node.dbname}"`);
+        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
         if (node.options && node.options.length > 0) {
             const options = list_utils_1.ListUtils.unwrapList(node.options)
                 .map(option => this.visit(option, context))
@@ -7495,7 +7463,7 @@ class Deparser {
         if (!node.dbname) {
             throw new Error('DropdbStmt requires dbname');
         }
-        output.push(`"${node.dbname}"`);
+        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
         if (node.options && node.options.length > 0) {
             const options = list_utils_1.ListUtils.unwrapList(node.options)
                 .map(option => this.visit(option, context))
@@ -7593,7 +7561,7 @@ class Deparser {
             case 'OBJECT_POLICY':
                 output.push('POLICY');
                 if (node.subname) {
-                    output.push(quote_utils_1.QuoteUtils.quote(node.subname));
+                    output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
                 }
                 break;
             case 'OBJECT_PUBLICATION':
@@ -7651,7 +7619,7 @@ class Deparser {
         }
         // Handle OBJECT_RULE special case: rule_name ON table_name format
         if (node.renameType === 'OBJECT_RULE' && node.subname && node.relation) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.subname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
             output.push('ON');
             output.push(this.RangeVar(node.relation, context));
         }
@@ -7670,7 +7638,7 @@ class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const objectName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(objectName)} USING ${accessMethod}`);
+                    output.push(`${quote_utils_1.QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -7691,19 +7659,19 @@ class Deparser {
             }
         }
         if (node.renameType === 'OBJECT_COLUMN' && node.subname) {
-            output.push('RENAME COLUMN', `"${node.subname}"`, 'TO');
+            output.push('RENAME COLUMN', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_DOMCONSTRAINT' && node.subname) {
-            output.push('RENAME CONSTRAINT', `"${node.subname}"`, 'TO');
+            output.push('RENAME CONSTRAINT', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_TABCONSTRAINT' && node.subname) {
-            output.push('RENAME CONSTRAINT', `"${node.subname}"`, 'TO');
+            output.push('RENAME CONSTRAINT', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_ATTRIBUTE' && node.subname) {
-            output.push('RENAME ATTRIBUTE', `"${node.subname}"`, 'TO');
+            output.push('RENAME ATTRIBUTE', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_ROLE' && node.subname) {
-            output.push(`"${node.subname}"`, 'RENAME TO');
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'RENAME TO');
         }
         else if (node.renameType === 'OBJECT_SCHEMA' && node.subname) {
             output.push(this.quoteIfNeeded(node.subname), 'RENAME TO');
@@ -7717,7 +7685,7 @@ class Deparser {
         if (!node.newname) {
             throw new Error('RenameStmt requires newname');
         }
-        output.push(quote_utils_1.QuoteUtils.quote(node.newname));
+        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.newname));
         // Handle CASCADE/RESTRICT behavior for RENAME operations
         if (node.behavior === 'DROP_CASCADE') {
             output.push('CASCADE');
@@ -7740,7 +7708,7 @@ class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const objectName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(objectName)} USING ${accessMethod}`);
+                    output.push(`${quote_utils_1.QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -8010,7 +7978,7 @@ class Deparser {
     SecLabelStmt(node, context) {
         const output = ['SECURITY LABEL'];
         if (node.provider) {
-            output.push('FOR', `"${node.provider}"`);
+            output.push('FOR', quote_utils_1.QuoteUtils.quoteIdentifier(node.provider));
         }
         output.push('ON');
         if (node.objtype) {
@@ -8163,7 +8131,7 @@ class Deparser {
         }
         output.push('LANGUAGE');
         if (node.plname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.plname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.plname));
         }
         if (node.plhandler && node.plhandler.length > 0) {
             output.push('HANDLER');
@@ -8199,7 +8167,7 @@ class Deparser {
         }
         output.push('LANGUAGE');
         if (node.lang) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.lang));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.lang));
         }
         output.push('(');
         const transforms = [];
@@ -8227,7 +8195,7 @@ class Deparser {
         }
         output.push('TRIGGER');
         if (node.trigname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.trigname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.trigname));
         }
         if (context.isPretty()) {
             const components = [];
@@ -8391,14 +8359,14 @@ class Deparser {
             output.push('OLD TABLE AS');
         }
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
         }
         return output.join(' ');
     }
     CreateEventTrigStmt(node, context) {
         const output = ['CREATE EVENT TRIGGER'];
         if (node.trigname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.trigname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.trigname));
         }
         output.push('ON');
         if (node.eventname) {
@@ -8424,7 +8392,7 @@ class Deparser {
     AlterEventTrigStmt(node, context) {
         const output = ['ALTER EVENT TRIGGER'];
         if (node.trigname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.trigname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.trigname));
         }
         if (node.tgenabled) {
             switch (node.tgenabled) {
@@ -8559,11 +8527,11 @@ class Deparser {
         }
         output.push('ALL', 'IN', 'TABLESPACE');
         if (node.orig_tablespacename) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.orig_tablespacename));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.orig_tablespacename));
         }
         output.push('SET', 'TABLESPACE');
         if (node.new_tablespacename) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.new_tablespacename));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.new_tablespacename));
         }
         if (node.nowait) {
             output.push('NOWAIT');
@@ -8587,10 +8555,10 @@ class Deparser {
             const sequenceName = [];
             const seq = node.sequence;
             if (seq.schemaname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quote(seq.schemaname));
+                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.schemaname));
             }
             if (seq.relname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quote(seq.relname));
+                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.relname));
             }
             output.push(sequenceName.join('.'));
         }
@@ -8624,10 +8592,10 @@ class Deparser {
             const sequenceName = [];
             const seq = node.sequence;
             if (seq.schemaname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quote(seq.schemaname));
+                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.schemaname));
             }
             if (seq.relname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quote(seq.relname));
+                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.relname));
             }
             output.push(sequenceName.join('.'));
         }
@@ -8974,7 +8942,7 @@ class Deparser {
     }
     aliasname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quote(node);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
         }
         return this.visit(node, context);
     }
@@ -9006,13 +8974,8 @@ 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 = quote_utils_1.QuoteUtils.quoteIdentifier(defName);
+                                const preservedDefName = quotedDefName !== defName ? quotedDefName : this.preserveOperatorDefElemCase(defName);
                                 if ((defName.toLowerCase() === 'commutator' || defName.toLowerCase() === 'negator') && defValue.List) {
                                     const listItems = list_utils_1.ListUtils.unwrapList(defValue.List.items);
                                     if (listItems.length === 1 && listItems[0].String) {
@@ -9028,7 +8991,7 @@ class Deparser {
                             else if (defName && !defValue) {
                                 // Handle boolean flags like HASHES, MERGES - preserve original case
                                 if (defName === 'Hashes' || defName === 'Merges') {
-                                    return `"${defName}"`;
+                                    return quote_utils_1.QuoteUtils.quoteIdentifier(defName);
                                 }
                                 return this.preserveOperatorDefElemCase(defName).toUpperCase();
                             }
@@ -9167,13 +9130,8 @@ 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 = quote_utils_1.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}'`;
@@ -9328,7 +9286,7 @@ class Deparser {
     AlterDatabaseStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.dbname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
         }
         if (node.options && node.options.length > 0) {
             const options = list_utils_1.ListUtils.unwrapList(node.options).map(opt => this.visit(opt, context));
@@ -9339,7 +9297,7 @@ class Deparser {
     AlterDatabaseRefreshCollStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.dbname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
         }
         output.push('REFRESH', 'COLLATION', 'VERSION');
         return output.join(' ');
@@ -9347,7 +9305,7 @@ class Deparser {
     AlterDatabaseSetStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.dbname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
         }
         if (node.setstmt) {
             const setClause = this.VariableSetStmt(node.setstmt, context);
@@ -9358,7 +9316,7 @@ class Deparser {
     DeclareCursorStmt(node, context) {
         const output = ['DECLARE'];
         if (node.portalname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.portalname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.portalname));
         }
         // Handle cursor options before CURSOR keyword
         const cursorOptions = [];
@@ -9400,7 +9358,7 @@ class Deparser {
         else if (node.pubobjtype === 'PUBLICATIONOBJ_TABLES_IN_SCHEMA') {
             output.push('TABLES IN SCHEMA');
             if (node.name) {
-                output.push(quote_utils_1.QuoteUtils.quote(node.name));
+                output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
             }
         }
         else if (node.pubobjtype === 'PUBLICATIONOBJ_TABLES_IN_CUR_SCHEMA') {
@@ -9426,7 +9384,7 @@ class Deparser {
     CreateAmStmt(node, context) {
         const output = ['CREATE', 'ACCESS', 'METHOD'];
         if (node.amname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.amname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.amname));
         }
         output.push('TYPE');
         switch (node.amtype) {
@@ -9486,7 +9444,7 @@ class Deparser {
             }
         }
         if (node.tableSpaceName) {
-            output.push('TABLESPACE', quote_utils_1.QuoteUtils.quote(node.tableSpaceName));
+            output.push('TABLESPACE', quote_utils_1.QuoteUtils.quoteIdentifier(node.tableSpaceName));
         }
         return output.join(' ');
     }
@@ -9644,7 +9602,7 @@ class Deparser {
     RangeTableFuncCol(node, context) {
         const output = [];
         if (node.colname) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.colname));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.colname));
         }
         if (node.for_ordinality) {
             output.push('FOR ORDINALITY');
@@ -9790,10 +9748,10 @@ class Deparser {
         if (node.op === 'IS_XMLPI') {
             if (node.name && node.args && node.args.length > 0) {
                 const argStrs = list_utils_1.ListUtils.unwrapList(node.args).map(arg => this.visit(arg, context));
-                return `xmlpi(name ${quote_utils_1.QuoteUtils.quote(node.name)}, ${argStrs.join(', ')})`;
+                return `xmlpi(name ${quote_utils_1.QuoteUtils.quoteIdentifier(node.name)}, ${argStrs.join(', ')})`;
             }
             else if (node.name) {
-                return `xmlpi(name ${quote_utils_1.QuoteUtils.quote(node.name)})`;
+                return `xmlpi(name ${quote_utils_1.QuoteUtils.quoteIdentifier(node.name)})`;
             }
             else {
                 return 'XMLPI()';
@@ -9808,7 +9766,7 @@ class Deparser {
                 output.push('XMLELEMENT');
                 const elementParts = [];
                 if (node.name) {
-                    elementParts.push(`NAME ${quote_utils_1.QuoteUtils.quote(node.name)}`);
+                    elementParts.push(`NAME ${quote_utils_1.QuoteUtils.quoteIdentifier(node.name)}`);
                 }
                 if (node.named_args && node.named_args.length > 0) {
                     const namedArgStrs = list_utils_1.ListUtils.unwrapList(node.named_args).map(arg => this.visit(arg, context));
@@ -9908,7 +9866,7 @@ 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 = quote_utils_1.QuoteUtils.quote(node.name);
+                const quotedName = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
                 output.push(`NAME ${quotedName}`);
             }
             if (node.args && node.args.length > 0) {
@@ -9929,26 +9887,26 @@ class Deparser {
     }
     schemaname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quote(node);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quote(node.String.sval);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
         }
         // Handle other node types without recursion
         if (node && typeof node === 'object') {
             if (node.sval !== undefined) {
-                return quote_utils_1.QuoteUtils.quote(node.sval);
+                return quote_utils_1.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 quote_utils_1.QuoteUtils.quote(items[0].String.sval);
+                    return quote_utils_1.QuoteUtils.quoteIdentifier(items[0].String.sval);
                 }
             }
             // For other complex nodes, try to extract string value without recursion
             if (node.val !== undefined) {
-                return quote_utils_1.QuoteUtils.quote(node.val);
+                return quote_utils_1.QuoteUtils.quoteIdentifier(node.val);
             }
             return '';
         }
@@ -10011,7 +9969,7 @@ class Deparser {
         }
         output.push('RULE');
         if (node.rulename) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.rulename));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.rulename));
         }
         output.push('AS ON');
         if (node.event) {
@@ -10078,42 +10036,42 @@ class Deparser {
     }
     relname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quote(node);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quote(node.String.sval);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
         }
         if (node && typeof node === 'object' && node.relname) {
-            return quote_utils_1.QuoteUtils.quote(node.relname);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node.relname);
         }
         return this.visit(node, context);
     }
     rel(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quote(node);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quote(node.String.sval);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
         }
         if (node && node.RangeVar) {
             return this.RangeVar(node.RangeVar, context);
         }
         if (node && typeof node === 'object' && node.relname) {
-            return quote_utils_1.QuoteUtils.quote(node.relname);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node.relname);
         }
         return this.visit(node, context);
     }
     objname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quote(node);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quote(node.String.sval);
+            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
         }
         if (Array.isArray(node)) {
             const parts = node.map(part => {
                 if (part && part.String && part.String.sval) {
-                    return quote_utils_1.QuoteUtils.quote(part.String.sval);
+                    return quote_utils_1.QuoteUtils.quoteIdentifier(part.String.sval);
                 }
                 return this.visit(part, context);
             });
@@ -10184,7 +10142,7 @@ class Deparser {
     CurrentOfExpr(node, context) {
         const output = ['CURRENT OF'];
         if (node.cursor_name) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.cursor_name));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.cursor_name));
         }
         if (node.cursor_param > 0) {
             output.push(`$${node.cursor_param}`);
@@ -10267,7 +10225,7 @@ class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const domainName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(domainName)}`);
+                    output.push(quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, domainName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10279,7 +10237,7 @@ class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const typeName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(typeName)}`);
+                    output.push(quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, typeName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10291,7 +10249,7 @@ class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const conversionName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(conversionName)}`);
+                    output.push(quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, conversionName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10303,7 +10261,7 @@ class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const parserName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(parserName)}`);
+                    output.push(quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, parserName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10315,7 +10273,7 @@ class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const configName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(configName)}`);
+                    output.push(quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, configName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10327,7 +10285,7 @@ class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const templateName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(templateName)}`);
+                    output.push(quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, templateName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10339,7 +10297,7 @@ class Deparser {
                 if (items.length === 2) {
                     const schemaName = items[0].String?.sval || '';
                     const dictionaryName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(dictionaryName)}`);
+                    output.push(quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, dictionaryName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10351,13 +10309,13 @@ class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const opClassName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(opClassName)} USING ${accessMethod}`);
+                    output.push(`${quote_utils_1.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(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(opClassName)} USING ${accessMethod}`);
+                    output.push(`${quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, opClassName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10369,13 +10327,13 @@ class Deparser {
                 if (items.length === 2) {
                     const accessMethod = items[0].String?.sval || '';
                     const opFamilyName = items[1].String?.sval || '';
-                    output.push(`${quote_utils_1.QuoteUtils.quote(opFamilyName)} USING ${accessMethod}`);
+                    output.push(`${quote_utils_1.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(`${quote_utils_1.QuoteUtils.quote(schemaName)}.${quote_utils_1.QuoteUtils.quote(opFamilyName)} USING ${accessMethod}`);
+                    output.push(`${quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, opFamilyName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10387,7 +10345,7 @@ class Deparser {
         }
         output.push('SET SCHEMA');
         if (node.newschema) {
-            output.push(quote_utils_1.QuoteUtils.quote(node.newschema));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.newschema));
         }
         return output.join(' ');
     }
@@ -10456,7 +10414,7 @@ class Deparser {
         }
         if (node.servername) {
             output.push('SERVER');
-            output.push(quote_utils_1.QuoteUtils.quote(node.servername));
+            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             const foreignTableContext = context.spawn('CreateForeignTableStmt');