pgsql-deparser 18.3.9 → 18.3.11

package/README.md

@@ -69,27 +69,29 @@ console.log(deparse(stmt));
 // Output: SELECT * FROM another_table
 ```
 
-### Latest Version (PostgreSQL 17)
+### Latest Version (PostgreSQL 18)
 
 ```sh
 npm install pgsql-deparser
 ```
 
-### Version-Specific Packages (PostgreSQL 13-16)
+### Version-Specific Packages (PostgreSQL 13-17)
 
-While we highly recommend using PG17, for PostgreSQL versions 13-16, use the version-specific packages:
+We recommend PG18. PG17 remains fully supported; for PostgreSQL versions 13-17, use the version-specific packages:
 
 ```sh
 npm install pgsql-deparser@pg13  # PostgreSQL 13
 npm install pgsql-deparser@pg14  # PostgreSQL 14
 npm install pgsql-deparser@pg15  # PostgreSQL 15
 npm install pgsql-deparser@pg16  # PostgreSQL 16
+npm install pgsql-deparser@pg17  # PostgreSQL 17
 ```
 
 **Version Status:**
-- **PG17**: 🚀 Recommended (stable + modern AST)
-- **PG14-16**: ⚠️ Experimental (modern AST, hardening in progress)
-- **PG13**: Stable (legacy AST format)
+- **PG18**: 🚀 Recommended (stable + modern AST)
+- **PG17**: Stable (modern AST)
+- **PG14-16**: Legacy (modern AST, not actively developed)
+- **PG13**: Legacy (legacy AST format)
 
 ## Options
 

package/deparser.d.ts

@@ -260,9 +260,12 @@ export declare class Deparser implements DeparserVisitor {
     OnConflictExpr(node: t.OnConflictExpr, context: DeparserContext): string;
     ScanToken(node: t.ScanToken, context: DeparserContext): string;
     CreateOpClassItem(node: t.CreateOpClassItem, context: DeparserContext): string;
+    private quoteDefElemArg;
+    private formatOptionValue;
     Var(node: t.Var, context: DeparserContext): string;
     TableFunc(node: t.TableFunc, context: DeparserContext): string;
     RangeTableFunc(node: t.RangeTableFunc, context: DeparserContext): string;
+    private formatXmlTableExpr;
     RangeTableFuncCol(node: t.RangeTableFuncCol, context: DeparserContext): string;
     formatJsonFormat(format: t.JsonFormat | undefined): string | null;
     formatJsonOutput(output: t.JsonOutput | undefined, context: DeparserContext): string | null;

package/deparser.js

@@ -132,6 +132,21 @@ function formatBitString(bsval) {
     }
     return `b'${quote(bsval)}'`;
 }
+const NUMERIC_LITERAL = /^[+-]?(?:0[xX](?:_?[0-9A-Fa-f])+|0[oO](?:_?[0-7])+|0[bB](?:_?[01])+|(?:\d(?:_?\d)*(?:\.(?:\d(?:_?\d)*)?)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)$/;
+function formatInteger(ival) {
+    const value = String(ival);
+    if (!/^[+-]?\d+$/.test(value)) {
+        throw new Error(`Invalid integer literal: ${value}`);
+    }
+    return value;
+}
+function formatNumeric(fval) {
+    const value = String(fval);
+    if (!NUMERIC_LITERAL.test(value)) {
+        throw new Error(`Invalid numeric literal: ${value}`);
+    }
+    return value;
+}
 class Deparser {
     tree;
     options;
@@ -1600,39 +1615,39 @@ class Deparser {
         if (nodeAny.ival !== undefined) {
             if (typeof nodeAny.ival === 'object' && nodeAny.ival !== null) {
                 if (nodeAny.ival.ival !== undefined) {
-                    return nodeAny.ival.ival.toString();
+                    return formatInteger(nodeAny.ival.ival);
                 }
                 else if (Object.keys(nodeAny.ival).length === 0) {
                     return '0';
                 }
                 else {
-                    return nodeAny.ival.toString();
+                    return formatInteger(nodeAny.ival);
                 }
             }
             else if (nodeAny.ival === null) {
                 return 'NULL';
             }
             else {
-                return nodeAny.ival.toString();
+                return formatInteger(nodeAny.ival);
             }
         }
         else if (nodeAny.fval !== undefined) {
             if (typeof nodeAny.fval === 'object' && nodeAny.fval !== null) {
                 if (nodeAny.fval.fval !== undefined) {
-                    return nodeAny.fval.fval.toString();
+                    return formatNumeric(nodeAny.fval.fval);
                 }
                 else if (Object.keys(nodeAny.fval).length === 0) {
                     return '0.0';
                 }
                 else {
-                    return nodeAny.fval.toString();
+                    return formatNumeric(nodeAny.fval);
                 }
             }
             else if (nodeAny.fval === null) {
                 return 'NULL';
             }
             else {
-                return nodeAny.fval.toString();
+                return formatNumeric(nodeAny.fval);
             }
         }
         else if (nodeAny.sval !== undefined) {
@@ -1697,10 +1712,10 @@ class Deparser {
         }
         if (nodeAny.val) {
             if (nodeAny.val.Integer?.ival !== undefined) {
-                return nodeAny.val.Integer.ival.toString();
+                return formatInteger(nodeAny.val.Integer.ival);
             }
             else if (nodeAny.val.Float?.fval !== undefined) {
-                return nodeAny.val.Float.fval.toString();
+                return formatNumeric(nodeAny.val.Float.fval);
             }
             else if (nodeAny.val.String?.sval !== undefined) {
                 return quotes_1.QuoteUtils.escape(nodeAny.val.String.sval);
@@ -1721,15 +1736,15 @@ class Deparser {
             }
             if (nodeAny.Integer !== undefined) {
                 if (typeof nodeAny.Integer === 'object' && nodeAny.Integer.ival !== undefined) {
-                    return nodeAny.Integer.ival.toString();
+                    return formatInteger(nodeAny.Integer.ival);
                 }
-                return nodeAny.Integer.toString();
+                return formatInteger(nodeAny.Integer);
             }
             if (nodeAny.Float !== undefined) {
                 if (typeof nodeAny.Float === 'object' && nodeAny.Float.fval !== undefined) {
-                    return nodeAny.Float.fval.toString();
+                    return formatNumeric(nodeAny.Float.fval);
                 }
-                return nodeAny.Float.toString();
+                return formatNumeric(nodeAny.Float);
             }
             if (nodeAny.String !== undefined) {
                 if (typeof nodeAny.String === 'object' && nodeAny.String.sval !== undefined) {
@@ -2380,10 +2395,10 @@ class Deparser {
         return quotes_1.QuoteUtils.quoteIdentifier(value);
     }
     Integer(node, context) {
-        return node.ival?.toString() || '0';
+        return node.ival === undefined || node.ival === null ? '0' : formatInteger(node.ival);
     }
     Float(node, context) {
-        return node.fval || '0.0';
+        return node.fval ? formatNumeric(node.fval) : '0.0';
     }
     Boolean(node, context) {
         return node.boolval ? 'true' : 'false';
@@ -3621,7 +3636,7 @@ class Deparser {
                 const opclassOpts = list_utils_1.ListUtils.unwrapList(node.opclassopts).map(opt => {
                     if (opt.DefElem && opt.DefElem.arg && this.getNodeType(opt.DefElem.arg) === 'String') {
                         const stringData = this.getNodeData(opt.DefElem.arg);
-                        return `${opt.DefElem.defname}='${stringData.sval}'`;
+                        return `${quotes_1.QuoteUtils.quoteIdentifierAfterDot(opt.DefElem.defname)}=${quotes_1.QuoteUtils.escape(stringData.sval)}`;
                     }
                     return this.visit(opt, context.spawn('IndexElem'));
                 });
@@ -3922,19 +3937,19 @@ class Deparser {
             case 'TRANS_STMT_PREPARE':
                 output.push('PREPARE TRANSACTION');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(quotes_1.QuoteUtils.escape(node.gid));
                 }
                 break;
             case 'TRANS_STMT_COMMIT_PREPARED':
                 output.push('COMMIT PREPARED');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(quotes_1.QuoteUtils.escape(node.gid));
                 }
                 break;
             case 'TRANS_STMT_ROLLBACK_PREPARED':
                 output.push('ROLLBACK PREPARED');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(quotes_1.QuoteUtils.escape(node.gid));
                 }
                 break;
             default:
@@ -4010,8 +4025,8 @@ class Deparser {
                     const nodeData = this.getNodeData(arg);
                     if (nodeData.sval !== undefined) {
                         const svalValue = typeof nodeData.sval === 'object' ? nodeData.sval.sval : nodeData.sval;
-                        if (svalValue === '' || svalValue.includes(' ') || svalValue.includes('-') || /[A-Z]/.test(svalValue) || /^\d/.test(svalValue) || svalValue.includes('.') || svalValue.includes('$') || svalValue.toLowerCase() === 'all' || /^[+-]\d/.test(svalValue)) {
-                            return `'${svalValue}'`;
+                        if (!/^[a-z_][a-z0-9_]*$/.test(svalValue) || svalValue.includes(' ') || svalValue.includes('-') || /[A-Z]/.test(svalValue) || /^\d/.test(svalValue) || svalValue.includes('.') || svalValue.includes('$') || svalValue.toLowerCase() === 'all' || /^[+-]\d/.test(svalValue)) {
+                            return quotes_1.QuoteUtils.escape(svalValue);
                         }
                         return svalValue;
                     }
@@ -5538,9 +5553,9 @@ class Deparser {
         if (context.parentNodeTypes.includes('IndexElem')) {
             if (node.arg && this.getNodeType(node.arg) === 'String') {
                 const stringData = this.getNodeData(node.arg);
-                return `${node.defname}='${stringData.sval}'`;
+                return `${quotes_1.QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${quotes_1.QuoteUtils.escape(stringData.sval)}`;
             }
-            return `${node.defname}=${this.visit(node.arg, context.spawn('DefElem'))}`;
+            return `${quotes_1.QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, this.visit(node.arg, context.spawn('DefElem')))}`;
         }
         // Handle CREATE OPERATOR boolean flags - MUST be first to preserve case
         if (context.parentNodeTypes.includes('DefineStmt') &&
@@ -5565,9 +5580,7 @@ class Deparser {
                 const defElemContext = context.spawn('DefElem');
                 const argValue = this.visit(node.arg, defElemContext);
                 if (context.parentNodeTypes.includes('CreateFdwStmt') || context.parentNodeTypes.includes('AlterFdwStmt')) {
-                    const finalValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                        ? `'${argValue}'`
-                        : argValue;
+                    const finalValue = this.quoteDefElemArg(node.arg, argValue);
                     const quotedDefname = quotes_1.QuoteUtils.quoteIdentifier(node.defname);
                     if (node.defaction === 'DEFELEM_ADD') {
                         return `ADD ${quotedDefname} ${finalValue}`;
@@ -5580,9 +5593,7 @@ class Deparser {
                     }
                     return `${quotedDefname} ${finalValue}`;
                 }
-                const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                    ? `'${argValue}'`
-                    : argValue;
+                const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                 if (node.defaction === 'DEFELEM_ADD') {
                     return `ADD ${node.defname} ${quotedValue}`;
                 }
@@ -5614,9 +5625,7 @@ class Deparser {
                 }
                 const defElemContext = context.spawn('DefElem');
                 const argValue = this.visit(node.arg, defElemContext);
-                const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                    ? `'${argValue}'`
-                    : argValue;
+                const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                 return `PASSWORD ${quotedValue}`;
             }
         }
@@ -5681,9 +5690,7 @@ class Deparser {
                     }
                 }
                 if (node.defname === 'validUntil') {
-                    const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                        ? `'${argValue}'`
-                        : argValue;
+                    const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                     return `VALID UNTIL ${quotedValue}`;
                 }
                 if (node.defname === 'adminmembers') {
@@ -5863,9 +5870,7 @@ class Deparser {
                 if (context.parentNodeTypes.includes('AlterExtensionStmt')) {
                     if (node.defname === 'new_version') {
                         // argValue is unquoted due to DefElem context, so we need to quote it
-                        const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                            ? `'${argValue}'`
-                            : argValue;
+                        const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                         return `UPDATE TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
@@ -5890,15 +5895,15 @@ class Deparser {
             }
             // Handle IndexStmt WITH clause options - no quotes, compact formatting
             if (context.parentNodeTypes.includes('IndexStmt')) {
-                return `${node.defname}=${argValue}`;
+                return `${quotes_1.QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle IndexElem opclassopts - preserve string values as strings
             if (context.parentNodeTypes.includes('IndexElem')) {
                 if (node.arg && this.getNodeType(node.arg) === 'String') {
                     const stringData = this.getNodeData(node.arg);
-                    return `${node.defname}='${stringData.sval}'`;
+                    return `${quotes_1.QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${quotes_1.QuoteUtils.escape(stringData.sval)}`;
                 }
-                return `${node.defname}=${argValue}`;
+                return `${quotes_1.QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle CreateStmt table options - no quotes, compact formatting
             if (context.parentNodeTypes.includes('CreateStmt')) {
@@ -5908,9 +5913,9 @@ class Deparser {
                 // For numeric values, use the raw value without quotes
                 if (node.arg && this.getNodeType(node.arg) === 'Integer') {
                     const integerData = this.getNodeData(node.arg);
-                    return `${relOptName}=${integerData.ival}`;
+                    return `${relOptName}=${formatInteger(integerData.ival)}`;
                 }
-                return `${relOptName}=${argValue}`;
+                return `${relOptName}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle CreateEventTrigStmt WHEN clause - use IN syntax for List arguments
             if (context.parentNodeTypes.includes('CreateEventTrigStmt')) {
@@ -5920,7 +5925,7 @@ class Deparser {
                     const values = listItems.map(item => {
                         if (this.getNodeType(item) === 'String') {
                             const stringData = this.getNodeData(item);
-                            return `'${stringData.sval || ''}'`;
+                            return quotes_1.QuoteUtils.escape(stringData.sval || '');
                         }
                         return this.visit(item, context);
                     });
@@ -5935,7 +5940,7 @@ class Deparser {
                 if (node.arg && this.getNodeType(node.arg) === 'TypeName') {
                     return `${optionName} = ${argValue}`;
                 }
-                return `${optionName} = ${argValue}`;
+                return `${optionName} = ${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle ViewStmt WITH options - don't quote numeric values
             if (context.parentNodeTypes.includes('ViewStmt')) {
@@ -6008,7 +6013,7 @@ class Deparser {
                                 return `${quotedDefname} = ${stringData.sval}`;
                             }
                             // Regular string literals get single quotes
-                            return `${quotedDefname} = '${stringData.sval}'`;
+                            return `${quotedDefname} = ${quotes_1.QuoteUtils.escape(stringData.sval)}`;
                         }
                         return `${quotedDefname} = ${argValue}`;
                     }
@@ -6029,7 +6034,7 @@ class Deparser {
                         return `${node.defname} = ${stringData.sval}`;
                     }
                     // Regular string literals get single quotes
-                    return `${node.defname} = '${stringData.sval}'`;
+                    return `${node.defname} = ${quotes_1.QuoteUtils.escape(stringData.sval)}`;
                 }
                 if (node.arg && this.getNodeType(node.arg) === 'Boolean') {
                     const boolData = this.getNodeData(node.arg);
@@ -6079,7 +6084,7 @@ class Deparser {
         }
         if (node.location) {
             output.push('LOCATION');
-            output.push(`'${node.location}'`);
+            output.push(quotes_1.QuoteUtils.escape(node.location));
         }
         if (node.options && node.options.length > 0) {
             output.push('WITH');
@@ -6412,7 +6417,7 @@ class Deparser {
         }
         if (node.payload !== null && node.payload !== undefined) {
             output.push(',');
-            output.push(`'${node.payload}'`);
+            output.push(quotes_1.QuoteUtils.escape(node.payload));
         }
         return output.join(' ');
     }
@@ -6440,7 +6445,7 @@ class Deparser {
         if (!node.filename) {
             throw new Error('LoadStmt requires filename');
         }
-        return `LOAD '${node.filename}'`;
+        return `LOAD ${quotes_1.QuoteUtils.escape(node.filename)}`;
     }
     DiscardStmt(node, context) {
         switch (node.target) {
@@ -6927,7 +6932,7 @@ class Deparser {
         }
         output.push('CONNECTION');
         if (node.conninfo) {
-            output.push(`'${node.conninfo}'`);
+            output.push(quotes_1.QuoteUtils.escape(node.conninfo));
         }
         output.push('PUBLICATION');
         if (node.publication && node.publication.length > 0) {
@@ -8210,7 +8215,7 @@ class Deparser {
         }
         output.push('IS');
         if (node.label) {
-            output.push(`'${node.label}'`);
+            output.push(quotes_1.QuoteUtils.escape(node.label));
         }
         else {
             output.push('NULL');
@@ -8267,10 +8272,10 @@ class Deparser {
             output.push(conversionName);
         }
         if (node.for_encoding_name) {
-            output.push('FOR', `'${node.for_encoding_name}'`);
+            output.push('FOR', quotes_1.QuoteUtils.escape(node.for_encoding_name));
         }
         if (node.to_encoding_name) {
-            output.push('TO', `'${node.to_encoding_name}'`);
+            output.push('TO', quotes_1.QuoteUtils.escape(node.to_encoding_name));
         }
         if (node.func_name && node.func_name.length > 0) {
             output.push('FROM');
@@ -9405,7 +9410,7 @@ class Deparser {
                                 const preservedDefName = quotedDefName !== defName ? quotedDefName : defName;
                                 // Handle String arguments with single quotes for string literals
                                 if (defValue.String) {
-                                    return `${preservedDefName} = '${defValue.String.sval}'`;
+                                    return `${preservedDefName} = ${quotes_1.QuoteUtils.escape(defValue.String.sval)}`;
                                 }
                                 return `${preservedDefName} = ${this.visit(defValue, context)}`;
                             }
@@ -9528,7 +9533,7 @@ class Deparser {
                                 // For CREATE COLLATION, ensure String nodes are quoted as string literals
                                 let valueStr;
                                 if (defValue.String) {
-                                    valueStr = `'${defValue.String.sval}'`;
+                                    valueStr = quotes_1.QuoteUtils.escape(defValue.String.sval);
                                 }
                                 else {
                                     valueStr = this.visit(defValue, context);
@@ -9795,6 +9800,21 @@ class Deparser {
         }
         return output.join(' ');
     }
+    quoteDefElemArg(arg, argValue) {
+        if (arg && this.getNodeType(arg) === 'String') {
+            return quotes_1.QuoteUtils.escape(this.getNodeData(arg).sval || '');
+        }
+        return typeof argValue === 'string' && !argValue.startsWith("'")
+            ? quotes_1.QuoteUtils.escape(argValue)
+            : argValue;
+    }
+    formatOptionValue(arg, argValue) {
+        if (arg && this.getNodeType(arg) === 'String') {
+            const sval = this.getNodeData(arg).sval || '';
+            return /^[A-Za-z_][A-Za-z0-9_]*$/.test(sval) ? sval : quotes_1.QuoteUtils.escape(sval);
+        }
+        return argValue;
+    }
     Var(node, context) {
         if (node.varno && node.varattno) {
             return `$${node.varno}.${node.varattno}`;
@@ -9834,7 +9854,7 @@ class Deparser {
             }
             if (node.rowexpr) {
                 output.push(',');
-                output.push(`'${this.visit(node.rowexpr, context)}'`);
+                output.push(this.visit(node.rowexpr, context));
             }
             if (node.colexprs && node.colexprs.length > 0) {
                 output.push('COLUMNS');
@@ -9851,25 +9871,40 @@ class Deparser {
         if (node.lateral) {
             output.push('LATERAL');
         }
-        if (node.docexpr) {
-            output.push(this.visit(node.docexpr, context));
+        const args = [];
+        if (node.namespaces && node.namespaces.length > 0) {
+            const namespaces = list_utils_1.ListUtils.unwrapList(node.namespaces).map(ns => {
+                const target = this.getNodeData(ns);
+                const uri = this.visit(target.val, context);
+                return target.name ? `${uri} AS ${quotes_1.QuoteUtils.quoteIdentifier(target.name)}` : `DEFAULT ${uri}`;
+            });
+            args.push(`XMLNAMESPACES(${namespaces.join(', ')}),`);
         }
         if (node.rowexpr) {
-            output.push('PASSING');
-            output.push(this.visit(node.rowexpr, context));
+            args.push(this.formatXmlTableExpr(node.rowexpr, context));
+        }
+        if (node.docexpr) {
+            args.push('PASSING');
+            args.push(this.formatXmlTableExpr(node.docexpr, context));
         }
         if (node.columns && node.columns.length > 0) {
-            output.push('COLUMNS');
-            const columns = list_utils_1.ListUtils.unwrapList(node.columns)
+            args.push('COLUMNS');
+            args.push(list_utils_1.ListUtils.unwrapList(node.columns)
                 .map(col => this.visit(col, context))
-                .join(', ');
-            output.push(`(${columns})`);
+                .join(', '));
         }
+        output.push(`XMLTABLE(${args.join(' ')})`);
         if (node.alias) {
             output.push(this.Alias(node.alias, context));
         }
         return output.join(' ');
     }
+    formatXmlTableExpr(expr, context) {
+        const value = this.visit(expr, context);
+        return ['A_Const', 'ColumnRef', 'ParamRef', 'FuncCall'].includes(this.getNodeType(expr))
+            ? value
+            : `(${value})`;
+    }
     RangeTableFuncCol(node, context) {
         const output = [];
         if (node.colname) {
@@ -9883,12 +9918,15 @@ class Deparser {
         }
         if (node.colexpr) {
             output.push('PATH');
-            output.push(`'${this.visit(node.colexpr, context)}'`);
+            output.push(this.visit(node.colexpr, context));
         }
         if (node.coldefexpr) {
             output.push('DEFAULT');
             output.push(this.visit(node.coldefexpr, context));
         }
+        if (node.is_not_null) {
+            output.push('NOT NULL');
+        }
         return output.join(' ');
     }
     formatJsonFormat(format) {

package/esm/deparser.js

@@ -129,6 +129,21 @@ function formatBitString(bsval) {
     }
     return `b'${quote(bsval)}'`;
 }
+const NUMERIC_LITERAL = /^[+-]?(?:0[xX](?:_?[0-9A-Fa-f])+|0[oO](?:_?[0-7])+|0[bB](?:_?[01])+|(?:\d(?:_?\d)*(?:\.(?:\d(?:_?\d)*)?)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)$/;
+function formatInteger(ival) {
+    const value = String(ival);
+    if (!/^[+-]?\d+$/.test(value)) {
+        throw new Error(`Invalid integer literal: ${value}`);
+    }
+    return value;
+}
+function formatNumeric(fval) {
+    const value = String(fval);
+    if (!NUMERIC_LITERAL.test(value)) {
+        throw new Error(`Invalid numeric literal: ${value}`);
+    }
+    return value;
+}
 export class Deparser {
     tree;
     options;
@@ -1597,39 +1612,39 @@ export class Deparser {
         if (nodeAny.ival !== undefined) {
             if (typeof nodeAny.ival === 'object' && nodeAny.ival !== null) {
                 if (nodeAny.ival.ival !== undefined) {
-                    return nodeAny.ival.ival.toString();
+                    return formatInteger(nodeAny.ival.ival);
                 }
                 else if (Object.keys(nodeAny.ival).length === 0) {
                     return '0';
                 }
                 else {
-                    return nodeAny.ival.toString();
+                    return formatInteger(nodeAny.ival);
                 }
             }
             else if (nodeAny.ival === null) {
                 return 'NULL';
             }
             else {
-                return nodeAny.ival.toString();
+                return formatInteger(nodeAny.ival);
             }
         }
         else if (nodeAny.fval !== undefined) {
             if (typeof nodeAny.fval === 'object' && nodeAny.fval !== null) {
                 if (nodeAny.fval.fval !== undefined) {
-                    return nodeAny.fval.fval.toString();
+                    return formatNumeric(nodeAny.fval.fval);
                 }
                 else if (Object.keys(nodeAny.fval).length === 0) {
                     return '0.0';
                 }
                 else {
-                    return nodeAny.fval.toString();
+                    return formatNumeric(nodeAny.fval);
                 }
             }
             else if (nodeAny.fval === null) {
                 return 'NULL';
             }
             else {
-                return nodeAny.fval.toString();
+                return formatNumeric(nodeAny.fval);
             }
         }
         else if (nodeAny.sval !== undefined) {
@@ -1694,10 +1709,10 @@ export class Deparser {
         }
         if (nodeAny.val) {
             if (nodeAny.val.Integer?.ival !== undefined) {
-                return nodeAny.val.Integer.ival.toString();
+                return formatInteger(nodeAny.val.Integer.ival);
             }
             else if (nodeAny.val.Float?.fval !== undefined) {
-                return nodeAny.val.Float.fval.toString();
+                return formatNumeric(nodeAny.val.Float.fval);
             }
             else if (nodeAny.val.String?.sval !== undefined) {
                 return QuoteUtils.escape(nodeAny.val.String.sval);
@@ -1718,15 +1733,15 @@ export class Deparser {
             }
             if (nodeAny.Integer !== undefined) {
                 if (typeof nodeAny.Integer === 'object' && nodeAny.Integer.ival !== undefined) {
-                    return nodeAny.Integer.ival.toString();
+                    return formatInteger(nodeAny.Integer.ival);
                 }
-                return nodeAny.Integer.toString();
+                return formatInteger(nodeAny.Integer);
             }
             if (nodeAny.Float !== undefined) {
                 if (typeof nodeAny.Float === 'object' && nodeAny.Float.fval !== undefined) {
-                    return nodeAny.Float.fval.toString();
+                    return formatNumeric(nodeAny.Float.fval);
                 }
-                return nodeAny.Float.toString();
+                return formatNumeric(nodeAny.Float);
             }
             if (nodeAny.String !== undefined) {
                 if (typeof nodeAny.String === 'object' && nodeAny.String.sval !== undefined) {
@@ -2377,10 +2392,10 @@ export class Deparser {
         return QuoteUtils.quoteIdentifier(value);
     }
     Integer(node, context) {
-        return node.ival?.toString() || '0';
+        return node.ival === undefined || node.ival === null ? '0' : formatInteger(node.ival);
     }
     Float(node, context) {
-        return node.fval || '0.0';
+        return node.fval ? formatNumeric(node.fval) : '0.0';
     }
     Boolean(node, context) {
         return node.boolval ? 'true' : 'false';
@@ -3618,7 +3633,7 @@ export class Deparser {
                 const opclassOpts = ListUtils.unwrapList(node.opclassopts).map(opt => {
                     if (opt.DefElem && opt.DefElem.arg && this.getNodeType(opt.DefElem.arg) === 'String') {
                         const stringData = this.getNodeData(opt.DefElem.arg);
-                        return `${opt.DefElem.defname}='${stringData.sval}'`;
+                        return `${QuoteUtils.quoteIdentifierAfterDot(opt.DefElem.defname)}=${QuoteUtils.escape(stringData.sval)}`;
                     }
                     return this.visit(opt, context.spawn('IndexElem'));
                 });
@@ -3919,19 +3934,19 @@ export class Deparser {
             case 'TRANS_STMT_PREPARE':
                 output.push('PREPARE TRANSACTION');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(QuoteUtils.escape(node.gid));
                 }
                 break;
             case 'TRANS_STMT_COMMIT_PREPARED':
                 output.push('COMMIT PREPARED');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(QuoteUtils.escape(node.gid));
                 }
                 break;
             case 'TRANS_STMT_ROLLBACK_PREPARED':
                 output.push('ROLLBACK PREPARED');
                 if (node.gid) {
-                    output.push(`'${node.gid}'`);
+                    output.push(QuoteUtils.escape(node.gid));
                 }
                 break;
             default:
@@ -4007,8 +4022,8 @@ export class Deparser {
                     const nodeData = this.getNodeData(arg);
                     if (nodeData.sval !== undefined) {
                         const svalValue = typeof nodeData.sval === 'object' ? nodeData.sval.sval : nodeData.sval;
-                        if (svalValue === '' || svalValue.includes(' ') || svalValue.includes('-') || /[A-Z]/.test(svalValue) || /^\d/.test(svalValue) || svalValue.includes('.') || svalValue.includes('$') || svalValue.toLowerCase() === 'all' || /^[+-]\d/.test(svalValue)) {
-                            return `'${svalValue}'`;
+                        if (!/^[a-z_][a-z0-9_]*$/.test(svalValue) || svalValue.includes(' ') || svalValue.includes('-') || /[A-Z]/.test(svalValue) || /^\d/.test(svalValue) || svalValue.includes('.') || svalValue.includes('$') || svalValue.toLowerCase() === 'all' || /^[+-]\d/.test(svalValue)) {
+                            return QuoteUtils.escape(svalValue);
                         }
                         return svalValue;
                     }
@@ -5535,9 +5550,9 @@ export class Deparser {
         if (context.parentNodeTypes.includes('IndexElem')) {
             if (node.arg && this.getNodeType(node.arg) === 'String') {
                 const stringData = this.getNodeData(node.arg);
-                return `${node.defname}='${stringData.sval}'`;
+                return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${QuoteUtils.escape(stringData.sval)}`;
             }
-            return `${node.defname}=${this.visit(node.arg, context.spawn('DefElem'))}`;
+            return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, this.visit(node.arg, context.spawn('DefElem')))}`;
         }
         // Handle CREATE OPERATOR boolean flags - MUST be first to preserve case
         if (context.parentNodeTypes.includes('DefineStmt') &&
@@ -5562,9 +5577,7 @@ export class Deparser {
                 const defElemContext = context.spawn('DefElem');
                 const argValue = this.visit(node.arg, defElemContext);
                 if (context.parentNodeTypes.includes('CreateFdwStmt') || context.parentNodeTypes.includes('AlterFdwStmt')) {
-                    const finalValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                        ? `'${argValue}'`
-                        : argValue;
+                    const finalValue = this.quoteDefElemArg(node.arg, argValue);
                     const quotedDefname = QuoteUtils.quoteIdentifier(node.defname);
                     if (node.defaction === 'DEFELEM_ADD') {
                         return `ADD ${quotedDefname} ${finalValue}`;
@@ -5577,9 +5590,7 @@ export class Deparser {
                     }
                     return `${quotedDefname} ${finalValue}`;
                 }
-                const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                    ? `'${argValue}'`
-                    : argValue;
+                const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                 if (node.defaction === 'DEFELEM_ADD') {
                     return `ADD ${node.defname} ${quotedValue}`;
                 }
@@ -5611,9 +5622,7 @@ export class Deparser {
                 }
                 const defElemContext = context.spawn('DefElem');
                 const argValue = this.visit(node.arg, defElemContext);
-                const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                    ? `'${argValue}'`
-                    : argValue;
+                const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                 return `PASSWORD ${quotedValue}`;
             }
         }
@@ -5678,9 +5687,7 @@ export class Deparser {
                     }
                 }
                 if (node.defname === 'validUntil') {
-                    const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                        ? `'${argValue}'`
-                        : argValue;
+                    const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                     return `VALID UNTIL ${quotedValue}`;
                 }
                 if (node.defname === 'adminmembers') {
@@ -5860,9 +5867,7 @@ export class Deparser {
                 if (context.parentNodeTypes.includes('AlterExtensionStmt')) {
                     if (node.defname === 'new_version') {
                         // argValue is unquoted due to DefElem context, so we need to quote it
-                        const quotedValue = typeof argValue === 'string' && !argValue.startsWith("'")
-                            ? `'${argValue}'`
-                            : argValue;
+                        const quotedValue = this.quoteDefElemArg(node.arg, argValue);
                         return `UPDATE TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
@@ -5887,15 +5892,15 @@ export class Deparser {
             }
             // Handle IndexStmt WITH clause options - no quotes, compact formatting
             if (context.parentNodeTypes.includes('IndexStmt')) {
-                return `${node.defname}=${argValue}`;
+                return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle IndexElem opclassopts - preserve string values as strings
             if (context.parentNodeTypes.includes('IndexElem')) {
                 if (node.arg && this.getNodeType(node.arg) === 'String') {
                     const stringData = this.getNodeData(node.arg);
-                    return `${node.defname}='${stringData.sval}'`;
+                    return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${QuoteUtils.escape(stringData.sval)}`;
                 }
-                return `${node.defname}=${argValue}`;
+                return `${QuoteUtils.quoteIdentifierAfterDot(node.defname)}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle CreateStmt table options - no quotes, compact formatting
             if (context.parentNodeTypes.includes('CreateStmt')) {
@@ -5905,9 +5910,9 @@ export class Deparser {
                 // For numeric values, use the raw value without quotes
                 if (node.arg && this.getNodeType(node.arg) === 'Integer') {
                     const integerData = this.getNodeData(node.arg);
-                    return `${relOptName}=${integerData.ival}`;
+                    return `${relOptName}=${formatInteger(integerData.ival)}`;
                 }
-                return `${relOptName}=${argValue}`;
+                return `${relOptName}=${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle CreateEventTrigStmt WHEN clause - use IN syntax for List arguments
             if (context.parentNodeTypes.includes('CreateEventTrigStmt')) {
@@ -5917,7 +5922,7 @@ export class Deparser {
                     const values = listItems.map(item => {
                         if (this.getNodeType(item) === 'String') {
                             const stringData = this.getNodeData(item);
-                            return `'${stringData.sval || ''}'`;
+                            return QuoteUtils.escape(stringData.sval || '');
                         }
                         return this.visit(item, context);
                     });
@@ -5932,7 +5937,7 @@ export class Deparser {
                 if (node.arg && this.getNodeType(node.arg) === 'TypeName') {
                     return `${optionName} = ${argValue}`;
                 }
-                return `${optionName} = ${argValue}`;
+                return `${optionName} = ${this.formatOptionValue(node.arg, argValue)}`;
             }
             // Handle ViewStmt WITH options - don't quote numeric values
             if (context.parentNodeTypes.includes('ViewStmt')) {
@@ -6005,7 +6010,7 @@ export class Deparser {
                                 return `${quotedDefname} = ${stringData.sval}`;
                             }
                             // Regular string literals get single quotes
-                            return `${quotedDefname} = '${stringData.sval}'`;
+                            return `${quotedDefname} = ${QuoteUtils.escape(stringData.sval)}`;
                         }
                         return `${quotedDefname} = ${argValue}`;
                     }
@@ -6026,7 +6031,7 @@ export class Deparser {
                         return `${node.defname} = ${stringData.sval}`;
                     }
                     // Regular string literals get single quotes
-                    return `${node.defname} = '${stringData.sval}'`;
+                    return `${node.defname} = ${QuoteUtils.escape(stringData.sval)}`;
                 }
                 if (node.arg && this.getNodeType(node.arg) === 'Boolean') {
                     const boolData = this.getNodeData(node.arg);
@@ -6076,7 +6081,7 @@ export class Deparser {
         }
         if (node.location) {
             output.push('LOCATION');
-            output.push(`'${node.location}'`);
+            output.push(QuoteUtils.escape(node.location));
         }
         if (node.options && node.options.length > 0) {
             output.push('WITH');
@@ -6409,7 +6414,7 @@ export class Deparser {
         }
         if (node.payload !== null && node.payload !== undefined) {
             output.push(',');
-            output.push(`'${node.payload}'`);
+            output.push(QuoteUtils.escape(node.payload));
         }
         return output.join(' ');
     }
@@ -6437,7 +6442,7 @@ export class Deparser {
         if (!node.filename) {
             throw new Error('LoadStmt requires filename');
         }
-        return `LOAD '${node.filename}'`;
+        return `LOAD ${QuoteUtils.escape(node.filename)}`;
     }
     DiscardStmt(node, context) {
         switch (node.target) {
@@ -6924,7 +6929,7 @@ export class Deparser {
         }
         output.push('CONNECTION');
         if (node.conninfo) {
-            output.push(`'${node.conninfo}'`);
+            output.push(QuoteUtils.escape(node.conninfo));
         }
         output.push('PUBLICATION');
         if (node.publication && node.publication.length > 0) {
@@ -8207,7 +8212,7 @@ export class Deparser {
         }
         output.push('IS');
         if (node.label) {
-            output.push(`'${node.label}'`);
+            output.push(QuoteUtils.escape(node.label));
         }
         else {
             output.push('NULL');
@@ -8264,10 +8269,10 @@ export class Deparser {
             output.push(conversionName);
         }
         if (node.for_encoding_name) {
-            output.push('FOR', `'${node.for_encoding_name}'`);
+            output.push('FOR', QuoteUtils.escape(node.for_encoding_name));
         }
         if (node.to_encoding_name) {
-            output.push('TO', `'${node.to_encoding_name}'`);
+            output.push('TO', QuoteUtils.escape(node.to_encoding_name));
         }
         if (node.func_name && node.func_name.length > 0) {
             output.push('FROM');
@@ -9402,7 +9407,7 @@ export class Deparser {
                                 const preservedDefName = quotedDefName !== defName ? quotedDefName : defName;
                                 // Handle String arguments with single quotes for string literals
                                 if (defValue.String) {
-                                    return `${preservedDefName} = '${defValue.String.sval}'`;
+                                    return `${preservedDefName} = ${QuoteUtils.escape(defValue.String.sval)}`;
                                 }
                                 return `${preservedDefName} = ${this.visit(defValue, context)}`;
                             }
@@ -9525,7 +9530,7 @@ export class Deparser {
                                 // For CREATE COLLATION, ensure String nodes are quoted as string literals
                                 let valueStr;
                                 if (defValue.String) {
-                                    valueStr = `'${defValue.String.sval}'`;
+                                    valueStr = QuoteUtils.escape(defValue.String.sval);
                                 }
                                 else {
                                     valueStr = this.visit(defValue, context);
@@ -9792,6 +9797,21 @@ export class Deparser {
         }
         return output.join(' ');
     }
+    quoteDefElemArg(arg, argValue) {
+        if (arg && this.getNodeType(arg) === 'String') {
+            return QuoteUtils.escape(this.getNodeData(arg).sval || '');
+        }
+        return typeof argValue === 'string' && !argValue.startsWith("'")
+            ? QuoteUtils.escape(argValue)
+            : argValue;
+    }
+    formatOptionValue(arg, argValue) {
+        if (arg && this.getNodeType(arg) === 'String') {
+            const sval = this.getNodeData(arg).sval || '';
+            return /^[A-Za-z_][A-Za-z0-9_]*$/.test(sval) ? sval : QuoteUtils.escape(sval);
+        }
+        return argValue;
+    }
     Var(node, context) {
         if (node.varno && node.varattno) {
             return `$${node.varno}.${node.varattno}`;
@@ -9831,7 +9851,7 @@ export class Deparser {
             }
             if (node.rowexpr) {
                 output.push(',');
-                output.push(`'${this.visit(node.rowexpr, context)}'`);
+                output.push(this.visit(node.rowexpr, context));
             }
             if (node.colexprs && node.colexprs.length > 0) {
                 output.push('COLUMNS');
@@ -9848,25 +9868,40 @@ export class Deparser {
         if (node.lateral) {
             output.push('LATERAL');
         }
-        if (node.docexpr) {
-            output.push(this.visit(node.docexpr, context));
+        const args = [];
+        if (node.namespaces && node.namespaces.length > 0) {
+            const namespaces = ListUtils.unwrapList(node.namespaces).map(ns => {
+                const target = this.getNodeData(ns);
+                const uri = this.visit(target.val, context);
+                return target.name ? `${uri} AS ${QuoteUtils.quoteIdentifier(target.name)}` : `DEFAULT ${uri}`;
+            });
+            args.push(`XMLNAMESPACES(${namespaces.join(', ')}),`);
         }
         if (node.rowexpr) {
-            output.push('PASSING');
-            output.push(this.visit(node.rowexpr, context));
+            args.push(this.formatXmlTableExpr(node.rowexpr, context));
+        }
+        if (node.docexpr) {
+            args.push('PASSING');
+            args.push(this.formatXmlTableExpr(node.docexpr, context));
         }
         if (node.columns && node.columns.length > 0) {
-            output.push('COLUMNS');
-            const columns = ListUtils.unwrapList(node.columns)
+            args.push('COLUMNS');
+            args.push(ListUtils.unwrapList(node.columns)
                 .map(col => this.visit(col, context))
-                .join(', ');
-            output.push(`(${columns})`);
+                .join(', '));
         }
+        output.push(`XMLTABLE(${args.join(' ')})`);
         if (node.alias) {
             output.push(this.Alias(node.alias, context));
         }
         return output.join(' ');
     }
+    formatXmlTableExpr(expr, context) {
+        const value = this.visit(expr, context);
+        return ['A_Const', 'ColumnRef', 'ParamRef', 'FuncCall'].includes(this.getNodeType(expr))
+            ? value
+            : `(${value})`;
+    }
     RangeTableFuncCol(node, context) {
         const output = [];
         if (node.colname) {
@@ -9880,12 +9915,15 @@ export class Deparser {
         }
         if (node.colexpr) {
             output.push('PATH');
-            output.push(`'${this.visit(node.colexpr, context)}'`);
+            output.push(this.visit(node.colexpr, context));
         }
         if (node.coldefexpr) {
             output.push('DEFAULT');
             output.push(this.visit(node.coldefexpr, context));
         }
+        if (node.is_not_null) {
+            output.push('NOT NULL');
+        }
         return output.join(' ');
     }
     formatJsonFormat(format) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "18.3.9",
+  "version": "18.3.11",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL AST Deparser",
   "main": "index.js",
@@ -60,5 +60,5 @@
     "@pgsql/quotes": "18.2.4",
     "@pgsql/types": "^18.0.0"
   },
-  "gitHead": "506aa3b63613eea04b78afc1ac440bc84b8a07ad"
+  "gitHead": "253de85d89081d866200077492ce69c3a2e96b04"
 }