pgsql-deparser 17.17.2 → 17.18.1

package/deparser.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Deparser = void 0;
 const base_1 = require("./visitors/base");
 const sql_formatter_1 = require("./utils/sql-formatter");
-const quote_utils_1 = require("./utils/quote-utils");
+const quotes_1 = require("@pgsql/quotes");
 const list_utils_1 = require("./utils/list-utils");
 /**
  * List of real PostgreSQL built-in types as they appear in pg_catalog.pg_type.typname.
@@ -508,9 +508,7 @@ class Deparser {
                 output.push('VALUES');
                 const lists = list_utils_1.ListUtils.unwrapList(node.valuesLists).map(list => {
                     const values = list_utils_1.ListUtils.unwrapList(list).map(val => this.visit(val, context));
-                    // Put each value on its own line for pretty printing
-                    const indentedValues = values.map(val => context.indent(val));
-                    return '(\n' + indentedValues.join(',\n') + '\n)';
+                    return context.parens(values.join(', '));
                 });
                 const indentedTuples = lists.map(tuple => {
                     if (this.containsMultilineStringLiteral(tuple)) {
@@ -1200,12 +1198,12 @@ class Deparser {
     ResTarget(node, context) {
         const output = [];
         if (context.update && node.name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+            output.push(quotes_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.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
+                        return `.${quotes_1.QuoteUtils.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
                     }
                     return this.visit(item, context);
                 });
@@ -1217,12 +1215,12 @@ class Deparser {
             }
         }
         else if (context.insertColumns && node.name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+            output.push(quotes_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.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
+                        return `.${quotes_1.QuoteUtils.quoteIdentifierAfterDot(item.String.sval || item.String.str)}`;
                     }
                     return this.visit(item, context);
                 });
@@ -1235,7 +1233,7 @@ class Deparser {
             }
             if (node.name) {
                 output.push('AS');
-                output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
             }
         }
         return output.join(' ');
@@ -1249,7 +1247,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.quoteIdentifier(resTarget.name)}` : '';
+                    const alias = resTarget.name ? ` AS ${quotes_1.QuoteUtils.quoteIdentifier(resTarget.name)}` : '';
                     return val + alias;
                 }
                 else {
@@ -1305,7 +1303,7 @@ class Deparser {
         const funcname = list_utils_1.ListUtils.unwrapList(node.funcname);
         const args = list_utils_1.ListUtils.unwrapList(node.args);
         const funcnameParts = funcname.map((n) => n.String?.sval || n.String?.str || '').filter((s) => s);
-        const name = quote_utils_1.QuoteUtils.quoteDottedName(funcnameParts);
+        const name = quotes_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);
@@ -1560,23 +1558,23 @@ class Deparser {
         else if (nodeAny.sval !== undefined) {
             if (typeof nodeAny.sval === 'object' && nodeAny.sval !== null) {
                 if (nodeAny.sval.sval !== undefined) {
-                    return quote_utils_1.QuoteUtils.formatEString(nodeAny.sval.sval);
+                    return quotes_1.QuoteUtils.formatEString(nodeAny.sval.sval);
                 }
                 else if (nodeAny.sval.String && nodeAny.sval.String.sval !== undefined) {
-                    return quote_utils_1.QuoteUtils.formatEString(nodeAny.sval.String.sval);
+                    return quotes_1.QuoteUtils.formatEString(nodeAny.sval.String.sval);
                 }
                 else if (Object.keys(nodeAny.sval).length === 0) {
                     return "''";
                 }
                 else {
-                    return quote_utils_1.QuoteUtils.formatEString(nodeAny.sval.toString());
+                    return quotes_1.QuoteUtils.formatEString(nodeAny.sval.toString());
                 }
             }
             else if (nodeAny.sval === null) {
                 return 'NULL';
             }
             else {
-                return quote_utils_1.QuoteUtils.formatEString(nodeAny.sval);
+                return quotes_1.QuoteUtils.formatEString(nodeAny.sval);
             }
         }
         else if (nodeAny.boolval !== undefined) {
@@ -1641,7 +1639,7 @@ class Deparser {
                 return nodeAny.val.Float.fval.toString();
             }
             else if (nodeAny.val.String?.sval !== undefined) {
-                return quote_utils_1.QuoteUtils.escape(nodeAny.val.String.sval);
+                return quotes_1.QuoteUtils.escape(nodeAny.val.String.sval);
             }
             else if (nodeAny.val.Boolean?.boolval !== undefined) {
                 return nodeAny.val.Boolean.boolval ? 'true' : 'false';
@@ -1671,9 +1669,9 @@ class Deparser {
             }
             if (nodeAny.String !== undefined) {
                 if (typeof nodeAny.String === 'object' && nodeAny.String.sval !== undefined) {
-                    return quote_utils_1.QuoteUtils.escape(nodeAny.String.sval);
+                    return quotes_1.QuoteUtils.escape(nodeAny.String.sval);
                 }
-                return quote_utils_1.QuoteUtils.escape(nodeAny.String);
+                return quotes_1.QuoteUtils.escape(nodeAny.String);
             }
             if (Object.keys(nodeAny).length === 0) {
                 return 'NULL';
@@ -1687,7 +1685,7 @@ class Deparser {
         const fields = list_utils_1.ListUtils.unwrapList(node.fields);
         return fields.map(field => {
             if (field.String) {
-                return quote_utils_1.QuoteUtils.quoteIdentifier(field.String.sval || field.String.str);
+                return quotes_1.QuoteUtils.quoteIdentifier(field.String.sval || field.String.str);
             }
             else if (field.A_Star) {
                 return '*';
@@ -1764,7 +1762,7 @@ class Deparser {
                 }
                 return output.join(' ');
             }
-            let result = mods(typeName, args);
+            let result = mods(quotes_1.QuoteUtils.quoteIdentifierTypeName(typeName), args);
             if (node.arrayBounds && node.arrayBounds.length > 0) {
                 result += formatArrayBounds(node.arrayBounds);
             }
@@ -1862,7 +1860,7 @@ class Deparser {
         }
         // Use type-name quoting for non-pg_catalog types
         // This allows keywords like 'json', 'int', 'boolean' to remain unquoted in type positions
-        let result = mods(quote_utils_1.QuoteUtils.quoteTypeDottedName(names), args);
+        let result = mods(quotes_1.QuoteUtils.quoteTypeDottedName(names), args);
         if (node.arrayBounds && node.arrayBounds.length > 0) {
             result += formatArrayBounds(node.arrayBounds);
         }
@@ -1900,17 +1898,17 @@ class Deparser {
         }
         let tableName = '';
         if (node.catalogname) {
-            tableName = quote_utils_1.QuoteUtils.quoteIdentifier(node.catalogname);
+            tableName = quotes_1.QuoteUtils.quoteIdentifier(node.catalogname);
             if (node.schemaname) {
-                tableName += '.' + quote_utils_1.QuoteUtils.quoteIdentifierAfterDot(node.schemaname);
+                tableName += '.' + quotes_1.QuoteUtils.quoteIdentifierAfterDot(node.schemaname);
             }
-            tableName += '.' + quote_utils_1.QuoteUtils.quoteIdentifierAfterDot(node.relname);
+            tableName += '.' + quotes_1.QuoteUtils.quoteIdentifierAfterDot(node.relname);
         }
         else if (node.schemaname) {
-            tableName = quote_utils_1.QuoteUtils.quoteQualifiedIdentifier(node.schemaname, node.relname);
+            tableName = quotes_1.QuoteUtils.quoteQualifiedIdentifier(node.schemaname, node.relname);
         }
         else {
-            tableName = quote_utils_1.QuoteUtils.quoteIdentifier(node.relname);
+            tableName = quotes_1.QuoteUtils.quoteIdentifier(node.relname);
         }
         output.push(tableName);
         if (node.alias) {
@@ -2136,7 +2134,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.quoteIdentifier(subnode.String.sval || subnode.String.str);
+                const value = subnode.A_Star ? '*' : quotes_1.QuoteUtils.quoteIdentifier(subnode.String.sval || subnode.String.str);
                 output.push(`.${value}`);
             }
             else {
@@ -2282,7 +2280,7 @@ class Deparser {
         return output.join(' ');
     }
     quoteIfNeeded(value) {
-        return quote_utils_1.QuoteUtils.quoteIdentifier(value);
+        return quotes_1.QuoteUtils.quoteIdentifier(value);
     }
     preserveOperatorDefElemCase(defName) {
         const caseMap = {
@@ -2301,7 +2299,7 @@ class Deparser {
     }
     String(node, context) {
         if (context.isStringLiteral || context.isEnumValue) {
-            return quote_utils_1.QuoteUtils.formatEString(node.sval || '');
+            return quotes_1.QuoteUtils.formatEString(node.sval || '');
         }
         const value = node.sval || '';
         if (context.parentNodeTypes.includes('DefElem') ||
@@ -2315,7 +2313,7 @@ class Deparser {
                 return value; // Don't quote pure operator symbols like "=" or "-"
             }
         }
-        return quote_utils_1.QuoteUtils.quoteIdentifier(value);
+        return quotes_1.QuoteUtils.quoteIdentifier(value);
     }
     Integer(node, context) {
         return node.ival?.toString() || '0';
@@ -2492,7 +2490,7 @@ class Deparser {
     ColumnDef(node, context) {
         const output = [];
         if (node.colname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.colname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.colname));
         }
         if (node.typeName) {
             output.push(this.TypeName(node.typeName, context));
@@ -2533,7 +2531,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.quoteIdentifier(node.conname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.conname));
         }
         switch (node.contype) {
             case 'CONSTR_NULL':
@@ -2876,6 +2874,10 @@ class Deparser {
                     });
                     output.push(`(${exclusionElements.join(', ')})`);
                 }
+                if (node.where_clause) {
+                    output.push('WHERE');
+                    output.push(context.parens(this.visit(node.where_clause, context)));
+                }
                 break;
         }
         // Handle deferrable constraints for all constraint types that support it
@@ -3009,6 +3011,8 @@ class Deparser {
         if (!node.frameOptions)
             return null;
         const frameOptions = node.frameOptions;
+        const EXCLUDE_MASK = 0x8000 | 0x10000 | 0x20000;
+        const baseFrameOptions = frameOptions & ~EXCLUDE_MASK;
         const frameParts = [];
         if (frameOptions & 0x01) { // FRAMEOPTION_NONDEFAULT
             if (frameOptions & 0x02) { // FRAMEOPTION_RANGE
@@ -3025,31 +3029,31 @@ class Deparser {
             return null;
         const boundsParts = [];
         // Handle specific frameOptions values that have known mappings
-        if (frameOptions === 789) {
+        if (baseFrameOptions === 789) {
             boundsParts.push('CURRENT ROW');
             boundsParts.push('AND UNBOUNDED FOLLOWING');
         }
-        else if (frameOptions === 1077) {
+        else if (baseFrameOptions === 1077) {
             boundsParts.push('UNBOUNDED PRECEDING');
             boundsParts.push('AND CURRENT ROW');
         }
-        else if (frameOptions === 18453) {
+        else if (baseFrameOptions === 18453) {
             if (node.startOffset && node.endOffset) {
                 boundsParts.push(`${this.visit(node.startOffset, context)} PRECEDING`);
                 boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
             }
         }
-        else if (frameOptions === 1557) {
+        else if (baseFrameOptions === 1557) {
             boundsParts.push('CURRENT ROW');
             boundsParts.push('AND CURRENT ROW');
         }
-        else if (frameOptions === 16917) {
+        else if (baseFrameOptions === 16917) {
             boundsParts.push('CURRENT ROW');
             if (node.endOffset) {
                 boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
             }
         }
-        else if (frameOptions === 1058) {
+        else if (baseFrameOptions === 1058) {
             return null;
         }
         else {
@@ -3103,6 +3107,16 @@ class Deparser {
             frameParts.push('BETWEEN');
             frameParts.push(boundsParts.join(' '));
         }
+        // EXCLUDE clause
+        if (frameOptions & 0x8000) { // FRAMEOPTION_EXCLUDE_CURRENT_ROW
+            frameParts.push('EXCLUDE CURRENT ROW');
+        }
+        else if (frameOptions & 0x10000) { // FRAMEOPTION_EXCLUDE_GROUP
+            frameParts.push('EXCLUDE GROUP');
+        }
+        else if (frameOptions & 0x20000) { // FRAMEOPTION_EXCLUDE_TIES
+            frameParts.push('EXCLUDE TIES');
+        }
         return frameParts.join(' ');
     }
     SortBy(node, context) {
@@ -3430,7 +3444,7 @@ class Deparser {
             output.push('IF NOT EXISTS');
         }
         if (node.idxname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.idxname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.idxname));
         }
         output.push('ON');
         if (node.relation) {
@@ -3464,14 +3478,14 @@ class Deparser {
         }
         if (node.tableSpace) {
             output.push('TABLESPACE');
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.tableSpace));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.tableSpace));
         }
         return output.join(' ');
     }
     IndexElem(node, context) {
         const output = [];
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
         }
         else if (node.expr) {
             output.push(context.parens(this.visit(node.expr, context)));
@@ -3522,7 +3536,7 @@ class Deparser {
     PartitionElem(node, context) {
         const output = [];
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
         }
         else if (node.expr) {
             output.push(context.parens(this.visit(node.expr, context)));
@@ -3772,19 +3786,19 @@ class Deparser {
             case 'TRANS_STMT_SAVEPOINT':
                 output.push('SAVEPOINT');
                 if (node.savepoint_name) {
-                    output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.savepoint_name));
+                    output.push(quotes_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.quoteIdentifier(node.savepoint_name));
+                    output.push(quotes_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.quoteIdentifier(node.savepoint_name));
+                    output.push(quotes_1.QuoteUtils.quoteIdentifier(node.savepoint_name));
                 }
                 break;
             case 'TRANS_STMT_PREPARE':
@@ -3881,16 +3895,16 @@ class Deparser {
                     return this.visit(arg, context);
                 }).join(', ') : '';
                 // Handle args - always include TO clause if args exist (even if empty string)
-                const paramName = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
+                const paramName = quotes_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 = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
+                const defaultParamName = quotes_1.QuoteUtils.quoteIdentifier(node.name);
                 return `SET ${defaultParamName} TO DEFAULT`;
             case 'VAR_SET_CURRENT':
-                const currentParamName = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
+                const currentParamName = quotes_1.QuoteUtils.quoteIdentifier(node.name);
                 return `SET ${currentParamName} FROM CURRENT`;
             case 'VAR_SET_MULTI':
                 if (node.name === 'TRANSACTION' || node.name === 'SESSION CHARACTERISTICS') {
@@ -3964,7 +3978,7 @@ class Deparser {
                     return `SET ${assignments}`;
                 }
             case 'VAR_RESET':
-                const resetParamName = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
+                const resetParamName = quotes_1.QuoteUtils.quoteIdentifier(node.name);
                 return `RESET ${resetParamName}`;
             case 'VAR_RESET_ALL':
                 return 'RESET ALL';
@@ -3984,7 +3998,7 @@ class Deparser {
             output.push('IF NOT EXISTS');
         }
         if (node.schemaname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.schemaname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.schemaname));
         }
         if (node.authrole) {
             output.push('AUTHORIZATION');
@@ -4233,7 +4247,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.quoteIdentifier(item.String.sval);
+                                return quotes_1.QuoteUtils.quoteIdentifier(item.String.sval);
                             }
                             return this.visit(item, context);
                         }).filter((name) => name && name.trim());
@@ -4267,13 +4281,13 @@ class Deparser {
                         if (items.length === 2) {
                             const accessMethod = items[0];
                             const objectName = items[1];
-                            return `${quote_utils_1.QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`;
+                            return `${quotes_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.quoteQualifiedIdentifier(schemaName, objectName)} USING ${accessMethod}`;
+                            return `${quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, objectName)} USING ${accessMethod}`;
                         }
                         return items.join('.');
                     }
@@ -4316,7 +4330,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.quoteIdentifier(item.String.sval);
+                                return quotes_1.QuoteUtils.quoteIdentifier(item.String.sval);
                             }
                             return this.visit(item, context);
                         }).filter((name) => name && name.trim());
@@ -4364,7 +4378,7 @@ class Deparser {
     PLAssignStmt(node, context) {
         const output = [];
         if (node.name) {
-            let nameWithIndirection = quote_utils_1.QuoteUtils.quoteIdentifier(node.name);
+            let nameWithIndirection = quotes_1.QuoteUtils.quoteIdentifier(node.name);
             if (node.indirection && node.indirection.length > 0) {
                 const indirectionStr = node.indirection
                     .map((ind) => this.visit(ind, context))
@@ -4513,7 +4527,7 @@ class Deparser {
                             const parts = [];
                             const indentedParts = [];
                             if (colDefData.colname) {
-                                parts.push(quote_utils_1.QuoteUtils.quoteIdentifier(colDefData.colname));
+                                parts.push(quotes_1.QuoteUtils.quoteIdentifier(colDefData.colname));
                             }
                             if (colDefData.typeName) {
                                 parts.push(this.TypeName(colDefData.typeName, context));
@@ -4571,7 +4585,7 @@ class Deparser {
                         else {
                             const parts = [];
                             if (colDefData.colname) {
-                                parts.push(quote_utils_1.QuoteUtils.quoteIdentifier(colDefData.colname));
+                                parts.push(quotes_1.QuoteUtils.quoteIdentifier(colDefData.colname));
                             }
                             if (colDefData.typeName) {
                                 parts.push(this.TypeName(colDefData.typeName, context));
@@ -4625,7 +4639,7 @@ class Deparser {
                         }
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -4642,7 +4656,7 @@ class Deparser {
                         output.push('ALTER COLUMN');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('TYPE');
                     if (node.def) {
@@ -4669,7 +4683,7 @@ class Deparser {
                 case 'AT_SetTableSpace':
                     output.push('SET TABLESPACE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_AddConstraint':
@@ -4687,7 +4701,7 @@ class Deparser {
                         output.push('DROP CONSTRAINT');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -4725,7 +4739,7 @@ class Deparser {
                 case 'AT_ColumnDefault':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.def) {
                         output.push('SET DEFAULT');
@@ -4738,7 +4752,7 @@ class Deparser {
                 case 'AT_SetStorage':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET STORAGE');
                     if (node.def) {
@@ -4749,7 +4763,7 @@ class Deparser {
                 case 'AT_ClusterOn':
                     output.push('CLUSTER ON');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DropCluster':
@@ -4776,21 +4790,21 @@ class Deparser {
                 case 'AT_SetNotNull':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_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.quoteIdentifier(node.name));
+                        output.push(quotes_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.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     else if (node.num !== undefined && node.num !== null) {
                         output.push(node.num.toString());
@@ -4803,7 +4817,7 @@ class Deparser {
                 case 'AT_SetOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET');
                     if (node.def) {
@@ -4820,7 +4834,7 @@ class Deparser {
                 case 'AT_ResetOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('RESET');
                     if (node.def) {
@@ -4837,7 +4851,7 @@ class Deparser {
                 case 'AT_SetCompression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET COMPRESSION');
                     if (node.def) {
@@ -4847,31 +4861,31 @@ class Deparser {
                 case 'AT_ValidateConstraint':
                     output.push('VALIDATE CONSTRAINT');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableTrig':
                     output.push('ENABLE TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableAlwaysTrig':
                     output.push('ENABLE ALWAYS TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableReplicaTrig':
                     output.push('ENABLE REPLICA TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DisableTrig':
                     output.push('DISABLE TRIGGER');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableTrigAll':
@@ -4889,31 +4903,31 @@ class Deparser {
                 case 'AT_EnableRule':
                     output.push('ENABLE RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableAlwaysRule':
                     output.push('ENABLE ALWAYS RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_EnableReplicaRule':
                     output.push('ENABLE REPLICA RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_DisableRule':
                     output.push('DISABLE RULE');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'AT_SetAccessMethod':
                     output.push('SET ACCESS METHOD');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     else {
                         // Handle DEFAULT access method case
@@ -4967,7 +4981,7 @@ class Deparser {
                 case 'AT_CookedColumnDefault':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.def) {
                         output.push('SET DEFAULT');
@@ -4980,7 +4994,7 @@ class Deparser {
                 case 'AT_SetExpression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET EXPRESSION');
                     if (node.def) {
@@ -4990,14 +5004,14 @@ class Deparser {
                 case 'AT_DropExpression':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_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.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET NOT NULL');
                     break;
@@ -5030,7 +5044,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.quoteIdentifier(constraintData.conname));
+                            output.push(quotes_1.QuoteUtils.quoteIdentifier(constraintData.conname));
                             if (constraintData.deferrable !== undefined) {
                                 output.push(constraintData.deferrable ? 'DEFERRABLE' : 'NOT DEFERRABLE');
                             }
@@ -5040,7 +5054,7 @@ class Deparser {
                         }
                     }
                     else if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                         if (node.def) {
                             output.push(this.visit(node.def, context));
                         }
@@ -5061,7 +5075,7 @@ class Deparser {
                 case 'AT_AlterColumnGenericOptions':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('OPTIONS');
                     if (node.def) {
@@ -5115,7 +5129,7 @@ class Deparser {
                 case 'AT_AddIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('ADD');
                     if (node.def) {
@@ -5125,7 +5139,7 @@ class Deparser {
                 case 'AT_SetIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('SET');
                     if (node.def) {
@@ -5135,7 +5149,7 @@ class Deparser {
                 case 'AT_DropIdentity':
                     output.push('ALTER COLUMN');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP IDENTITY');
                     if (node.behavior === 'DROP_CASCADE') {
@@ -5170,7 +5184,7 @@ class Deparser {
         }
         if (node.funcname && node.funcname.length > 0) {
             const funcnameParts = node.funcname.map((name) => name.String?.sval || name.String?.str || '').filter((s) => s);
-            const funcName = quote_utils_1.QuoteUtils.quoteDottedName(funcnameParts);
+            const funcName = quotes_1.QuoteUtils.quoteDottedName(funcnameParts);
             if (node.parameters && node.parameters.length > 0) {
                 const params = node.parameters
                     .filter((param) => {
@@ -5287,7 +5301,7 @@ class Deparser {
             }
         }
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
         }
         if (node.argType) {
             output.push(this.TypeName(node.argType, context));
@@ -5359,7 +5373,7 @@ class Deparser {
             output.push('ROLE');
         }
         if (node.role) {
-            const roleName = quote_utils_1.QuoteUtils.quoteIdentifier(node.role);
+            const roleName = quotes_1.QuoteUtils.quoteIdentifier(node.role);
             output.push(roleName);
         }
         if (node.options) {
@@ -5401,7 +5415,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 quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                return quotes_1.QuoteUtils.quoteIdentifier(node.defname);
             }
             return node.defname.charAt(0).toUpperCase() + node.defname.slice(1).toLowerCase();
         }
@@ -5423,7 +5437,7 @@ class Deparser {
                     const finalValue = typeof argValue === 'string' && !argValue.startsWith("'")
                         ? `'${argValue}'`
                         : argValue;
-                    const quotedDefname = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                    const quotedDefname = quotes_1.QuoteUtils.quoteIdentifier(node.defname);
                     if (node.defaction === 'DEFELEM_ADD') {
                         return `ADD ${quotedDefname} ${finalValue}`;
                     }
@@ -5447,7 +5461,7 @@ class Deparser {
                 else if (node.defaction === 'DEFELEM_SET') {
                     return `SET ${node.defname} ${quotedValue}`;
                 }
-                const quotedDefname = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                const quotedDefname = quotes_1.QuoteUtils.quoteIdentifier(node.defname);
                 return `${quotedDefname} ${quotedValue}`;
             }
             else if (node.defaction === 'DEFELEM_DROP') {
@@ -5498,16 +5512,16 @@ class Deparser {
             }
             if (context.parentNodeTypes.includes('CreatedbStmt') || context.parentNodeTypes.includes('DropdbStmt')) {
                 const quotedValue = typeof argValue === 'string'
-                    ? quote_utils_1.QuoteUtils.escape(argValue)
+                    ? quotes_1.QuoteUtils.escape(argValue)
                     : argValue;
                 return `${node.defname} = ${quotedValue}`;
             }
             // CreateForeignServerStmt and AlterForeignServerStmt use space format like CreateFdwStmt
             if (context.parentNodeTypes.includes('CreateForeignServerStmt') || context.parentNodeTypes.includes('AlterForeignServerStmt')) {
                 const quotedValue = typeof argValue === 'string'
-                    ? quote_utils_1.QuoteUtils.escape(argValue)
+                    ? quotes_1.QuoteUtils.escape(argValue)
                     : argValue;
-                const quotedDefname = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                const quotedDefname = quotes_1.QuoteUtils.quoteIdentifier(node.defname);
                 return `${quotedDefname} ${quotedValue}`;
             }
             if (context.parentNodeTypes.includes('CreateRoleStmt') || context.parentNodeTypes.includes('AlterRoleStmt')) {
@@ -5582,7 +5596,7 @@ class Deparser {
                             if (this.getNodeType(item) === 'String') {
                                 // Check if this identifier needs quotes to preserve case
                                 const value = itemData.sval;
-                                return quote_utils_1.QuoteUtils.quoteIdentifier(value);
+                                return quotes_1.QuoteUtils.quoteIdentifier(value);
                             }
                             return this.visit(item, context);
                         });
@@ -5730,7 +5744,7 @@ class Deparser {
                         return `${node.defname.toUpperCase()} ${argValue}`;
                     }
                     const quotedValue = typeof argValue === 'string'
-                        ? quote_utils_1.QuoteUtils.escape(argValue)
+                        ? quotes_1.QuoteUtils.escape(argValue)
                         : argValue;
                     return `${node.defname} ${quotedValue}`;
                 }
@@ -5792,7 +5806,7 @@ class Deparser {
                     return `${node.defname}=${argValue}`;
                 }
                 const quotedValue = typeof argValue === 'string'
-                    ? quote_utils_1.QuoteUtils.escape(argValue)
+                    ? quotes_1.QuoteUtils.escape(argValue)
                     : argValue;
                 return `${node.defname} = ${quotedValue}`;
             }
@@ -5830,12 +5844,12 @@ 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 quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                        return quotes_1.QuoteUtils.quoteIdentifier(node.defname);
                     }
                     return preservedName.toUpperCase();
                 }
                 // Handle CREATE AGGREGATE quoted identifiers - preserve quotes when needed
-                const quotedDefname = quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                const quotedDefname = quotes_1.QuoteUtils.quoteIdentifier(node.defname);
                 if (quotedDefname !== node.defname) {
                     if (node.arg) {
                         if (this.getNodeType(node.arg) === 'String') {
@@ -5888,7 +5902,7 @@ class Deparser {
                 }
             }
             const quotedValue = typeof argValue === 'string'
-                ? quote_utils_1.QuoteUtils.escape(argValue)
+                ? quotes_1.QuoteUtils.escape(argValue)
                 : argValue;
             return `${node.defname} = ${quotedValue}`;
         }
@@ -5896,7 +5910,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 quote_utils_1.QuoteUtils.quoteIdentifier(node.defname);
+                return quotes_1.QuoteUtils.quoteIdentifier(node.defname);
             }
         }
         return node.defname.toUpperCase();
@@ -6080,7 +6094,7 @@ class Deparser {
                 case 'REPLICA_IDENTITY_INDEX':
                     output.push('USING', 'INDEX');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 default:
@@ -6139,7 +6153,7 @@ class Deparser {
                         output.push('IF', 'EXISTS');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -6148,7 +6162,7 @@ class Deparser {
                 case 'AT_ValidateConstraint':
                     output.push('VALIDATE', 'CONSTRAINT');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'C':
@@ -6165,7 +6179,7 @@ class Deparser {
                         output.push('IF', 'EXISTS');
                     }
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     if (node.behavior === 'DROP_CASCADE') {
                         output.push('CASCADE');
@@ -6174,7 +6188,7 @@ class Deparser {
                 case 'V':
                     output.push('VALIDATE', 'CONSTRAINT');
                     if (node.name) {
-                        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+                        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     break;
                 case 'O':
@@ -6526,7 +6540,7 @@ class Deparser {
             output.push('NULL');
         }
         else if (node.comment) {
-            output.push(quote_utils_1.QuoteUtils.formatEString(node.comment));
+            output.push(quotes_1.QuoteUtils.formatEString(node.comment));
         }
         return output.join(' ');
     }
@@ -6563,7 +6577,7 @@ class Deparser {
         const output = [];
         const initialParts = ['CREATE', 'POLICY'];
         if (node.policy_name) {
-            initialParts.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.policy_name));
+            initialParts.push(quotes_1.QuoteUtils.quoteIdentifier(node.policy_name));
         }
         output.push(initialParts.join(' '));
         // Add ON clause on new line in pretty mode
@@ -6640,7 +6654,7 @@ class Deparser {
     AlterPolicyStmt(node, context) {
         const output = ['ALTER', 'POLICY'];
         if (node.policy_name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.policy_name));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.policy_name));
         }
         if (node.table) {
             output.push('ON');
@@ -6676,7 +6690,7 @@ class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -6724,7 +6738,7 @@ class Deparser {
     CreatePublicationStmt(node, context) {
         const output = ['CREATE', 'PUBLICATION'];
         if (node.pubname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.pubname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.pubname));
         }
         if (node.pubobjects && node.pubobjects.length > 0) {
             output.push('FOR', 'TABLE');
@@ -6744,7 +6758,7 @@ class Deparser {
     CreateSubscriptionStmt(node, context) {
         const output = ['CREATE', 'SUBSCRIPTION'];
         if (node.subname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.subname));
         }
         output.push('CONNECTION');
         if (node.conninfo) {
@@ -6765,7 +6779,7 @@ class Deparser {
     AlterPublicationStmt(node, context) {
         const output = ['ALTER', 'PUBLICATION'];
         if (node.pubname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.pubname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.pubname));
         }
         if (node.action) {
             switch (node.action) {
@@ -6800,7 +6814,7 @@ class Deparser {
     AlterSubscriptionStmt(node, context) {
         const output = ['ALTER', 'SUBSCRIPTION'];
         if (node.subname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.subname));
         }
         if (node.kind) {
             switch (node.kind) {
@@ -6846,7 +6860,7 @@ class Deparser {
             output.push('IF EXISTS');
         }
         if (node.subname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.subname));
         }
         if (node.behavior) {
             switch (node.behavior) {
@@ -7091,7 +7105,7 @@ class Deparser {
     ClosePortalStmt(node, context) {
         const output = ['CLOSE'];
         if (node.portalname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.portalname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.portalname));
         }
         else {
             output.push('ALL');
@@ -7149,7 +7163,7 @@ class Deparser {
             output.push('ALL');
         }
         if (node.portalname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.portalname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.portalname));
         }
         return output.join(' ');
     }
@@ -7219,7 +7233,7 @@ class Deparser {
     AlterFdwStmt(node, context) {
         const output = ['ALTER', 'FOREIGN', 'DATA', 'WRAPPER'];
         if (node.fdwname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.fdwname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.fdwname));
         }
         if (node.func_options && node.func_options.length > 0) {
             const fdwContext = context.spawn('AlterFdwStmt');
@@ -7240,16 +7254,16 @@ class Deparser {
             output.push('IF', 'NOT', 'EXISTS');
         }
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.servertype) {
-            output.push('TYPE', quote_utils_1.QuoteUtils.escape(node.servertype));
+            output.push('TYPE', quotes_1.QuoteUtils.escape(node.servertype));
         }
         if (node.version) {
-            output.push('VERSION', quote_utils_1.QuoteUtils.escape(node.version));
+            output.push('VERSION', quotes_1.QuoteUtils.escape(node.version));
         }
         if (node.fdwname) {
-            output.push('FOREIGN', 'DATA', 'WRAPPER', quote_utils_1.QuoteUtils.quoteIdentifier(node.fdwname));
+            output.push('FOREIGN', 'DATA', 'WRAPPER', quotes_1.QuoteUtils.quoteIdentifier(node.fdwname));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -7264,10 +7278,10 @@ class Deparser {
     AlterForeignServerStmt(node, context) {
         const output = ['ALTER', 'SERVER'];
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.version) {
-            output.push('VERSION', quote_utils_1.QuoteUtils.escape(node.version));
+            output.push('VERSION', quotes_1.QuoteUtils.escape(node.version));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -7289,7 +7303,7 @@ class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             output.push('OPTIONS');
@@ -7313,14 +7327,14 @@ class Deparser {
         }
         output.push('SERVER');
         if (node.servername) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
+            output.push(quotes_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.quoteIdentifier(node.remote_schema));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.remote_schema));
         }
         if (node.list_type) {
             switch (node.list_type) {
@@ -7346,11 +7360,11 @@ class Deparser {
         }
         output.push('FROM', 'SERVER');
         if (node.server_name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.server_name));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.server_name));
         }
         output.push('INTO');
         if (node.local_schema) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.local_schema));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.local_schema));
         }
         if (node.options && node.options.length > 0) {
             const importSchemaContext = context.spawn('ImportForeignSchemaStmt');
@@ -7364,7 +7378,7 @@ class Deparser {
         if (node.relation) {
             output.push(this.RangeVar(node.relation, context));
             if (node.indexname) {
-                output.push('USING', quote_utils_1.QuoteUtils.quoteIdentifier(node.indexname));
+                output.push('USING', quotes_1.QuoteUtils.quoteIdentifier(node.indexname));
             }
         }
         if (node.params && node.params.length > 0) {
@@ -7428,7 +7442,7 @@ class Deparser {
             output.push(this.RangeVar(node.relation, context));
         }
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
         }
         return output.join(' ');
     }
@@ -7468,7 +7482,7 @@ class Deparser {
         if (!node.dbname) {
             throw new Error('CreatedbStmt requires dbname');
         }
-        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
+        output.push(quotes_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))
@@ -7485,7 +7499,7 @@ class Deparser {
         if (!node.dbname) {
             throw new Error('DropdbStmt requires dbname');
         }
-        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
+        output.push(quotes_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))
@@ -7583,7 +7597,7 @@ class Deparser {
             case 'OBJECT_POLICY':
                 output.push('POLICY');
                 if (node.subname) {
-                    output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname));
+                    output.push(quotes_1.QuoteUtils.quoteIdentifier(node.subname));
                 }
                 break;
             case 'OBJECT_PUBLICATION':
@@ -7641,7 +7655,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.quoteIdentifier(node.subname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.subname));
             output.push('ON');
             output.push(this.RangeVar(node.relation, context));
         }
@@ -7660,7 +7674,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.quoteIdentifier(objectName)} USING ${accessMethod}`);
+                    output.push(`${quotes_1.QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -7681,19 +7695,19 @@ class Deparser {
             }
         }
         if (node.renameType === 'OBJECT_COLUMN' && node.subname) {
-            output.push('RENAME COLUMN', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
+            output.push('RENAME COLUMN', quotes_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_DOMCONSTRAINT' && node.subname) {
-            output.push('RENAME CONSTRAINT', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
+            output.push('RENAME CONSTRAINT', quotes_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_TABCONSTRAINT' && node.subname) {
-            output.push('RENAME CONSTRAINT', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
+            output.push('RENAME CONSTRAINT', quotes_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_ATTRIBUTE' && node.subname) {
-            output.push('RENAME ATTRIBUTE', quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
+            output.push('RENAME ATTRIBUTE', quotes_1.QuoteUtils.quoteIdentifier(node.subname), 'TO');
         }
         else if (node.renameType === 'OBJECT_ROLE' && node.subname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.subname), 'RENAME TO');
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.subname), 'RENAME TO');
         }
         else if (node.renameType === 'OBJECT_SCHEMA' && node.subname) {
             output.push(this.quoteIfNeeded(node.subname), 'RENAME TO');
@@ -7707,7 +7721,7 @@ class Deparser {
         if (!node.newname) {
             throw new Error('RenameStmt requires newname');
         }
-        output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.newname));
+        output.push(quotes_1.QuoteUtils.quoteIdentifier(node.newname));
         // Handle CASCADE/RESTRICT behavior for RENAME operations
         if (node.behavior === 'DROP_CASCADE') {
             output.push('CASCADE');
@@ -7730,7 +7744,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.quoteIdentifier(objectName)} USING ${accessMethod}`);
+                    output.push(`${quotes_1.QuoteUtils.quoteIdentifier(objectName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -8000,7 +8014,7 @@ class Deparser {
     SecLabelStmt(node, context) {
         const output = ['SECURITY LABEL'];
         if (node.provider) {
-            output.push('FOR', quote_utils_1.QuoteUtils.quoteIdentifier(node.provider));
+            output.push('FOR', quotes_1.QuoteUtils.quoteIdentifier(node.provider));
         }
         output.push('ON');
         if (node.objtype) {
@@ -8153,7 +8167,7 @@ class Deparser {
         }
         output.push('LANGUAGE');
         if (node.plname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.plname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.plname));
         }
         if (node.plhandler && node.plhandler.length > 0) {
             output.push('HANDLER');
@@ -8189,7 +8203,7 @@ class Deparser {
         }
         output.push('LANGUAGE');
         if (node.lang) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.lang));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.lang));
         }
         output.push('(');
         const transforms = [];
@@ -8217,7 +8231,7 @@ class Deparser {
         }
         output.push('TRIGGER');
         if (node.trigname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.trigname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.trigname));
         }
         if (context.isPretty()) {
             const components = [];
@@ -8381,14 +8395,14 @@ class Deparser {
             output.push('OLD TABLE AS');
         }
         if (node.name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.name));
+            output.push(quotes_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.quoteIdentifier(node.trigname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.trigname));
         }
         output.push('ON');
         if (node.eventname) {
@@ -8414,7 +8428,7 @@ class Deparser {
     AlterEventTrigStmt(node, context) {
         const output = ['ALTER EVENT TRIGGER'];
         if (node.trigname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.trigname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.trigname));
         }
         if (node.tgenabled) {
             switch (node.tgenabled) {
@@ -8549,11 +8563,11 @@ class Deparser {
         }
         output.push('ALL', 'IN', 'TABLESPACE');
         if (node.orig_tablespacename) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.orig_tablespacename));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.orig_tablespacename));
         }
         output.push('SET', 'TABLESPACE');
         if (node.new_tablespacename) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.new_tablespacename));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.new_tablespacename));
         }
         if (node.nowait) {
             output.push('NOWAIT');
@@ -8577,10 +8591,10 @@ class Deparser {
             const sequenceName = [];
             const seq = node.sequence;
             if (seq.schemaname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.schemaname));
+                sequenceName.push(quotes_1.QuoteUtils.quoteIdentifier(seq.schemaname));
             }
             if (seq.relname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.relname));
+                sequenceName.push(quotes_1.QuoteUtils.quoteIdentifier(seq.relname));
             }
             output.push(sequenceName.join('.'));
         }
@@ -8614,10 +8628,10 @@ class Deparser {
             const sequenceName = [];
             const seq = node.sequence;
             if (seq.schemaname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.schemaname));
+                sequenceName.push(quotes_1.QuoteUtils.quoteIdentifier(seq.schemaname));
             }
             if (seq.relname) {
-                sequenceName.push(quote_utils_1.QuoteUtils.quoteIdentifier(seq.relname));
+                sequenceName.push(quotes_1.QuoteUtils.quoteIdentifier(seq.relname));
             }
             output.push(sequenceName.join('.'));
         }
@@ -8964,7 +8978,7 @@ class Deparser {
     }
     aliasname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
+            return quotes_1.QuoteUtils.quoteIdentifier(node);
         }
         return this.visit(node, context);
     }
@@ -8996,7 +9010,7 @@ class Deparser {
                             const defName = defElem.defname;
                             const defValue = defElem.arg;
                             if (defName && defValue) {
-                                const quotedDefName = quote_utils_1.QuoteUtils.quoteIdentifier(defName);
+                                const quotedDefName = quotes_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);
@@ -9013,7 +9027,7 @@ class Deparser {
                             else if (defName && !defValue) {
                                 // Handle boolean flags like HASHES, MERGES - preserve original case
                                 if (defName === 'Hashes' || defName === 'Merges') {
-                                    return quote_utils_1.QuoteUtils.quoteIdentifier(defName);
+                                    return quotes_1.QuoteUtils.quoteIdentifier(defName);
                                 }
                                 return this.preserveOperatorDefElemCase(defName).toUpperCase();
                             }
@@ -9152,7 +9166,7 @@ class Deparser {
                             const defName = defElem.defname;
                             const defValue = defElem.arg;
                             if (defName && defValue) {
-                                const quotedDefName = quote_utils_1.QuoteUtils.quoteIdentifier(defName);
+                                const quotedDefName = quotes_1.QuoteUtils.quoteIdentifier(defName);
                                 const preservedDefName = quotedDefName !== defName ? quotedDefName : defName;
                                 // Handle String arguments with single quotes for string literals
                                 if (defValue.String) {
@@ -9308,7 +9322,7 @@ class Deparser {
     AlterDatabaseStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
+            output.push(quotes_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));
@@ -9319,7 +9333,7 @@ class Deparser {
     AlterDatabaseRefreshCollStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.dbname));
         }
         output.push('REFRESH', 'COLLATION', 'VERSION');
         return output.join(' ');
@@ -9327,7 +9341,7 @@ class Deparser {
     AlterDatabaseSetStmt(node, context) {
         const output = ['ALTER', 'DATABASE'];
         if (node.dbname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.dbname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.dbname));
         }
         if (node.setstmt) {
             const setClause = this.VariableSetStmt(node.setstmt, context);
@@ -9338,7 +9352,7 @@ class Deparser {
     DeclareCursorStmt(node, context) {
         const output = ['DECLARE'];
         if (node.portalname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.portalname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.portalname));
         }
         // Handle cursor options before CURSOR keyword
         const cursorOptions = [];
@@ -9380,7 +9394,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.quoteIdentifier(node.name));
+                output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
             }
         }
         else if (node.pubobjtype === 'PUBLICATIONOBJ_TABLES_IN_CUR_SCHEMA') {
@@ -9406,7 +9420,7 @@ class Deparser {
     CreateAmStmt(node, context) {
         const output = ['CREATE', 'ACCESS', 'METHOD'];
         if (node.amname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.amname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.amname));
         }
         output.push('TYPE');
         switch (node.amtype) {
@@ -9466,7 +9480,7 @@ class Deparser {
             }
         }
         if (node.tableSpaceName) {
-            output.push('TABLESPACE', quote_utils_1.QuoteUtils.quoteIdentifier(node.tableSpaceName));
+            output.push('TABLESPACE', quotes_1.QuoteUtils.quoteIdentifier(node.tableSpaceName));
         }
         return output.join(' ');
     }
@@ -9624,7 +9638,7 @@ class Deparser {
     RangeTableFuncCol(node, context) {
         const output = [];
         if (node.colname) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.colname));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.colname));
         }
         if (node.for_ordinality) {
             output.push('FOR ORDINALITY');
@@ -9770,10 +9784,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.quoteIdentifier(node.name)}, ${argStrs.join(', ')})`;
+                return `xmlpi(name ${quotes_1.QuoteUtils.quoteIdentifier(node.name)}, ${argStrs.join(', ')})`;
             }
             else if (node.name) {
-                return `xmlpi(name ${quote_utils_1.QuoteUtils.quoteIdentifier(node.name)})`;
+                return `xmlpi(name ${quotes_1.QuoteUtils.quoteIdentifier(node.name)})`;
             }
             else {
                 return 'XMLPI()';
@@ -9788,7 +9802,7 @@ class Deparser {
                 output.push('XMLELEMENT');
                 const elementParts = [];
                 if (node.name) {
-                    elementParts.push(`NAME ${quote_utils_1.QuoteUtils.quoteIdentifier(node.name)}`);
+                    elementParts.push(`NAME ${quotes_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));
@@ -9888,7 +9902,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.quoteIdentifier(node.name);
+                const quotedName = quotes_1.QuoteUtils.quoteIdentifier(node.name);
                 output.push(`NAME ${quotedName}`);
             }
             if (node.args && node.args.length > 0) {
@@ -9909,26 +9923,26 @@ class Deparser {
     }
     schemaname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
+            return quotes_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
+            return quotes_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.quoteIdentifier(node.sval);
+                return quotes_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.quoteIdentifier(items[0].String.sval);
+                    return quotes_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.quoteIdentifier(node.val);
+                return quotes_1.QuoteUtils.quoteIdentifier(node.val);
             }
             return '';
         }
@@ -9991,7 +10005,7 @@ class Deparser {
         }
         output.push('RULE');
         if (node.rulename) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.rulename));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.rulename));
         }
         output.push('AS ON');
         if (node.event) {
@@ -10058,42 +10072,42 @@ class Deparser {
     }
     relname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
+            return quotes_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
+            return quotes_1.QuoteUtils.quoteIdentifier(node.String.sval);
         }
         if (node && typeof node === 'object' && node.relname) {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node.relname);
+            return quotes_1.QuoteUtils.quoteIdentifier(node.relname);
         }
         return this.visit(node, context);
     }
     rel(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
+            return quotes_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
+            return quotes_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.quoteIdentifier(node.relname);
+            return quotes_1.QuoteUtils.quoteIdentifier(node.relname);
         }
         return this.visit(node, context);
     }
     objname(node, context) {
         if (typeof node === 'string') {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node);
+            return quotes_1.QuoteUtils.quoteIdentifier(node);
         }
         if (node && node.String && node.String.sval) {
-            return quote_utils_1.QuoteUtils.quoteIdentifier(node.String.sval);
+            return quotes_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.quoteIdentifier(part.String.sval);
+                    return quotes_1.QuoteUtils.quoteIdentifier(part.String.sval);
                 }
                 return this.visit(part, context);
             });
@@ -10164,7 +10178,7 @@ class Deparser {
     CurrentOfExpr(node, context) {
         const output = ['CURRENT OF'];
         if (node.cursor_name) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.cursor_name));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.cursor_name));
         }
         if (node.cursor_param > 0) {
             output.push(`$${node.cursor_param}`);
@@ -10247,7 +10261,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.quoteQualifiedIdentifier(schemaName, domainName));
+                    output.push(quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, domainName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10259,7 +10273,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.quoteQualifiedIdentifier(schemaName, typeName));
+                    output.push(quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, typeName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10271,7 +10285,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.quoteQualifiedIdentifier(schemaName, conversionName));
+                    output.push(quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, conversionName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10283,7 +10297,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.quoteQualifiedIdentifier(schemaName, parserName));
+                    output.push(quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, parserName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10295,7 +10309,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.quoteQualifiedIdentifier(schemaName, configName));
+                    output.push(quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, configName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10307,7 +10321,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.quoteQualifiedIdentifier(schemaName, templateName));
+                    output.push(quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, templateName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10319,7 +10333,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.quoteQualifiedIdentifier(schemaName, dictionaryName));
+                    output.push(quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, dictionaryName));
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10331,13 +10345,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.quoteIdentifier(opClassName)} USING ${accessMethod}`);
+                    output.push(`${quotes_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.quoteQualifiedIdentifier(schemaName, opClassName)} USING ${accessMethod}`);
+                    output.push(`${quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, opClassName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10349,13 +10363,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.quoteIdentifier(opFamilyName)} USING ${accessMethod}`);
+                    output.push(`${quotes_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.quoteQualifiedIdentifier(schemaName, opFamilyName)} USING ${accessMethod}`);
+                    output.push(`${quotes_1.QuoteUtils.quoteQualifiedIdentifier(schemaName, opFamilyName)} USING ${accessMethod}`);
                 }
                 else {
                     output.push(this.visit(node.object, context));
@@ -10367,7 +10381,7 @@ class Deparser {
         }
         output.push('SET SCHEMA');
         if (node.newschema) {
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.newschema));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.newschema));
         }
         return output.join(' ');
     }
@@ -10436,7 +10450,7 @@ class Deparser {
         }
         if (node.servername) {
             output.push('SERVER');
-            output.push(quote_utils_1.QuoteUtils.quoteIdentifier(node.servername));
+            output.push(quotes_1.QuoteUtils.quoteIdentifier(node.servername));
         }
         if (node.options && node.options.length > 0) {
             const foreignTableContext = context.spawn('CreateForeignTableStmt');