pgsql-deparser 17.18.2 → 17.18.4

package/deparser.js

@@ -1317,8 +1317,13 @@ class Deparser {
         }
         // Handle EXTRACT function with SQL syntax
         if (node.funcformat === 'COERCE_SQL_SYNTAX' && name === 'pg_catalog.extract' && args.length >= 2) {
-            const field = this.visit(args[0], context);
+            let field = this.visit(args[0], context);
             const source = this.visit(args[1], context);
+            // EXTRACT requires an unquoted uppercase keyword (EPOCH, YEAR, etc.)
+            // but A_Const sval deparsing wraps it in single quotes — strip and uppercase
+            if (field.startsWith("'") && field.endsWith("'")) {
+                field = field.slice(1, -1).toUpperCase();
+            }
             return `EXTRACT(${field} FROM ${source})`;
         }
         // Handle TRIM function with SQL syntax (TRIM TRAILING/LEADING/BOTH)
@@ -5003,7 +5008,8 @@ class Deparser {
                     }
                     output.push('SET EXPRESSION');
                     if (node.def) {
-                        output.push(this.visit(node.def, context));
+                        output.push('AS');
+                        output.push(context.parens(this.visit(node.def, context)));
                     }
                     break;
                 case 'AT_DropExpression':
@@ -5012,6 +5018,9 @@ class Deparser {
                         output.push(quotes_1.QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP EXPRESSION');
+                    if (node.missing_ok) {
+                        output.push('IF EXISTS');
+                    }
                     break;
                 case 'AT_CheckNotNull':
                     output.push('ALTER COLUMN');

package/esm/deparser.js

@@ -1314,8 +1314,13 @@ export class Deparser {
         }
         // Handle EXTRACT function with SQL syntax
         if (node.funcformat === 'COERCE_SQL_SYNTAX' && name === 'pg_catalog.extract' && args.length >= 2) {
-            const field = this.visit(args[0], context);
+            let field = this.visit(args[0], context);
             const source = this.visit(args[1], context);
+            // EXTRACT requires an unquoted uppercase keyword (EPOCH, YEAR, etc.)
+            // but A_Const sval deparsing wraps it in single quotes — strip and uppercase
+            if (field.startsWith("'") && field.endsWith("'")) {
+                field = field.slice(1, -1).toUpperCase();
+            }
             return `EXTRACT(${field} FROM ${source})`;
         }
         // Handle TRIM function with SQL syntax (TRIM TRAILING/LEADING/BOTH)
@@ -5000,7 +5005,8 @@ export class Deparser {
                     }
                     output.push('SET EXPRESSION');
                     if (node.def) {
-                        output.push(this.visit(node.def, context));
+                        output.push('AS');
+                        output.push(context.parens(this.visit(node.def, context)));
                     }
                     break;
                 case 'AT_DropExpression':
@@ -5009,6 +5015,9 @@ export class Deparser {
                         output.push(QuoteUtils.quoteIdentifier(node.name));
                     }
                     output.push('DROP EXPRESSION');
+                    if (node.missing_ok) {
+                        output.push('IF EXISTS');
+                    }
                     break;
                 case 'AT_CheckNotNull':
                     output.push('ALTER COLUMN');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "17.18.2",
+  "version": "17.18.4",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL AST Deparser",
   "main": "index.js",
@@ -60,5 +60,5 @@
     "@pgsql/quotes": "17.1.0",
     "@pgsql/types": "^17.6.2"
   },
-  "gitHead": "cdd732b4694b84522895d2d1dd8d5db9944875d5"
+  "gitHead": "987c0c66fee20025b193cb497d1ceb8832dc4ed2"
 }