pgsql-deparser 13.3.11 → 13.3.12

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.3.12](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.11...pgsql-deparser@13.3.12) (2022-07-29)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
 ## [13.3.11](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.10...pgsql-deparser@13.3.11) (2022-05-20)
 
 **Note:** Version bump only for package pgsql-deparser

package/README.md

@@ -1,4 +1,4 @@
-# pgsql-parser [![Build Status](https://travis-ci.org/pyramation/pgsql-parser.svg?branch=master)](https://travis-ci.org/pyramation/pgsql-parser)
+# pgsql-parser [![tests](https://github.com/pyramation/pgsql-parser/actions/workflows/run-tests.yaml/badge.svg)](https://github.com/pyramation/pgsql-parser/actions/workflows/run-tests.yaml)
 
 The real PostgreSQL parser for nodejs. The primary objective of this module is to provide symmetric parsing and deparsing of SQL statements. With this module you can modify parts of a SQL query statement and serialize the query tree back into a formatted SQL statement. It uses the *real* [PostgreSQL parser](https://github.com/pganalyze/libpg_query).
 

package/main/deparser.js

@@ -124,6 +124,15 @@ var Deparser = /*#__PURE__*/function () {
         return _lodash["default"].isArray(node) ? _this2.list(node, ', ', '', context) : _this2.deparse(node, context);
       });
     }
+  }, {
+    key: "deparseReturningList",
+    value: function deparseReturningList(list, context) {
+      var _this3 = this;
+
+      return list.map(function (returning) {
+        return _this3.deparse(returning.ResTarget.val, context) + (returning.ResTarget.name ? ' AS ' + _this3.quote(returning.ResTarget.name) : '');
+      }).join(',');
+    }
   }, {
     key: "list",
     value: function list(nodes) {
@@ -142,17 +151,17 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: "listQuotes",
     value: function listQuotes(nodes) {
-      var _this3 = this;
+      var _this4 = this;
 
       var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ', ';
       return this.list(nodes, separator).split(separator).map(function (a) {
-        return _this3.quote(a.trim());
+        return _this4.quote(a.trim());
       }).join(separator);
     }
   }, {
     key: "quote",
     value: function quote(value) {
-      var _this4 = this;
+      var _this5 = this;
 
       if (value == null) {
         return null;
@@ -160,7 +169,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (_lodash["default"].isArray(value)) {
         return value.map(function (o) {
-          return _this4.quote(o);
+          return _this5.quote(o);
         });
       }
 
@@ -229,10 +238,10 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: "type",
     value: function type(names, args) {
-      var _this5 = this;
+      var _this6 = this;
 
       var _names$map = names.map(function (name) {
-        return _this5.deparse(name);
+        return _this6.deparse(name);
       }),
           _names$map2 = (0, _slicedToArray2["default"])(_names$map, 2),
           catalog = _names$map2[0],
@@ -336,15 +345,15 @@ var Deparser = /*#__PURE__*/function () {
       output.push('TO');
       output.push(this.RangeVar(node.relation, context));
 
-      if (node.instead) {
-        output.push('DO');
-        output.push('INSTEAD');
-      }
-
       if (node.whereClause) {
         output.push('WHERE');
         output.push(this.deparse(node.whereClause, context));
-        output.push('DO');
+      }
+
+      output.push('DO');
+
+      if (node.instead) {
+        output.push('INSTEAD');
       }
 
       if (!node.actions || !node.actions.length) {
@@ -920,22 +929,22 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'ColumnRef',
     value: function ColumnRef(node) {
-      var _this6 = this;
+      var _this7 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var KEYWORDS = ['old', 'new'];
       var fields = node.fields.map(function (field) {
         if (field.String) {
-          var value = _this6.deparse(field, context);
+          var value = _this7.deparse(field, context);
 
           if (context === 'trigger' && KEYWORDS.includes(value.toLowerCase())) {
             return value.toUpperCase();
           }
 
-          return _this6.quote(value);
+          return _this7.quote(value);
         }
 
-        return _this6.deparse(field, context);
+        return _this7.deparse(field, context);
       });
       return fields.join('.');
     }
@@ -1038,7 +1047,8 @@ var Deparser = /*#__PURE__*/function () {
       output.push(node.ctename);
 
       if (node.aliascolnames) {
-        output.push((0, _util.format)('(%s)', this.quote(this.deparseNodes(node.aliascolnames, context))));
+        var colnames = this.quote(this.deparseNodes(node.aliascolnames, context));
+        output.push("(".concat(colnames.join(', '), ")"));
       }
 
       output.push((0, _util.format)('AS (%s)', this.deparse(node.ctequery)));
@@ -1151,7 +1161,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'DefElem',
     value: function DefElem(node) {
-      var _this7 = this;
+      var _this8 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -1226,7 +1236,7 @@ var Deparser = /*#__PURE__*/function () {
             {
               var output = [];
               node.arg.forEach(function (opt) {
-                output.push(_this7.quote(_this7.deparse(opt, context)));
+                output.push(_this8.quote(_this8.deparse(opt, context)));
               });
               return "OWNED BY ".concat(output.join('.'));
             }
@@ -1248,6 +1258,10 @@ var Deparser = /*#__PURE__*/function () {
             }
 
         }
+      } else if (context === 'explain') {
+        if (node.arg) {
+          return "".concat(name, " ").concat(this.deparse(node.arg));
+        }
       } else if (node.arg) {
         return "".concat(name, " = ").concat(this.deparse(node.arg, context));
       }
@@ -1272,7 +1286,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'FuncCall',
     value: function FuncCall(node) {
-      var _this8 = this;
+      var _this9 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -1280,7 +1294,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.args) {
         params = node.args.map(function (item) {
-          return _this8.deparse(item, context);
+          return _this9.deparse(item, context);
         });
       } // COUNT(*)
 
@@ -1446,10 +1460,13 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'InsertStmt',
     value: function InsertStmt(node) {
-      var _this9 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
+
+      if (node.withClause) {
+        output.push(this.WithClause(node.withClause, context));
+      }
+
       output.push('INSERT INTO');
       output.push(this.RangeVar(node.relation, context));
 
@@ -1495,9 +1512,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.returningList) {
         output.push('RETURNING');
-        output.push(node.returningList.map(function (returning) {
-          return _this9.deparse(returning.ResTarget.val, context) + (returning.ResTarget.name ? ' AS ' + _this9.quote(returning.ResTarget.name) : '');
-        }).join(','));
+        output.push(this.deparseReturningList(node.returningList, context));
       }
 
       return output.join(' ');
@@ -1520,15 +1535,30 @@ var Deparser = /*#__PURE__*/function () {
     value: function DeleteStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [''];
+
+      if (node.withClause) {
+        output.push(this.WithClause(node.withClause, context));
+      }
+
       output.push('DELETE');
       output.push('FROM');
       output.push(this.RangeVar(node.relation, context));
 
+      if (node.usingClause) {
+        output.push('USING');
+        output.push(this.list(node.usingClause, ', ', '', context));
+      }
+
       if (node.whereClause) {
         output.push('WHERE');
         output.push(this.deparse(node.whereClause, context));
       }
 
+      if (node.returningList) {
+        output.push('RETURNING');
+        output.push(this.deparseReturningList(node.returningList, context));
+      }
+
       return output.join(' ');
     }
   }, {
@@ -1538,6 +1568,11 @@ var Deparser = /*#__PURE__*/function () {
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
+
+      if (node.withClause) {
+        output.push(this.WithClause(node.withClause, context));
+      }
+
       output.push('UPDATE');
 
       if (node.relation) {
@@ -1575,9 +1610,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.returningList) {
         output.push('RETURNING');
-        output.push(node.returningList.map(function (returning) {
-          return _this10.deparse(returning.ResTarget.val, context) + (returning.ResTarget.name ? ' AS ' + _this10.quote(returning.ResTarget.name) : '');
-        }).join(','));
+        output.push(this.deparseReturningList(node.returningList, context));
       }
 
       return output.join(' ');
@@ -1712,15 +1745,11 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'LockStmt',
     value: function LockStmt(node) {
-      var _this11 = this;
-
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = ['LOCK'];
-      output.push(node.relations.map(function (e) {
-        return _this11.deparse(e, {
-          lock: true
-        });
-      }).join(', '));
+      output.push(this.list(node.relations, ', ', '', {
+        lock: true
+      }));
       output.push('IN');
       output.push(LOCK_MODES[node.mode]);
       output.push('MODE');
@@ -1882,7 +1911,7 @@ var Deparser = /*#__PURE__*/function () {
         output.push('ONLY');
       }
 
-      if (!node.inh && context.lock) {
+      if (!node.inh && (context.lock || context === 'truncate')) {
         output.push('ONLY');
       }
 
@@ -1890,7 +1919,7 @@ var Deparser = /*#__PURE__*/function () {
         output.push('UNLOGGED');
       }
 
-      if (node.relpersistence === 't') {
+      if (node.relpersistence === 't' && context !== 'view') {
         output.push('TEMPORARY TABLE');
       }
 
@@ -1938,13 +1967,20 @@ var Deparser = /*#__PURE__*/function () {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
       output.push('EXPLAIN');
+
+      if (node.options) {
+        output.push('(');
+        output.push(this.list(node.options, ', ', '', 'explain'));
+        output.push(')');
+      }
+
       output.push(this.deparse(node.query, context));
       return output.join(' ');
     }
   }, {
     key: 'SelectStmt',
     value: function SelectStmt(node) {
-      var _this12 = this;
+      var _this11 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -1994,7 +2030,7 @@ var Deparser = /*#__PURE__*/function () {
         ) {
             output.push('DISTINCT ON');
             var clause = node.distinctClause.map(function (e) {
-              return _this12.deparse(e, 'select');
+              return _this11.deparse(e, 'select');
             }).join(",".concat(NEWLINE_CHAR));
             output.push("(".concat(clause, ")"));
           } else {
@@ -2004,7 +2040,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.targetList) {
         output.push(indent(node.targetList.map(function (e) {
-          return _this12.deparse(e, 'select');
+          return _this11.deparse(e, 'select');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -2016,7 +2052,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.fromClause) {
         output.push('FROM');
         output.push(indent(node.fromClause.map(function (e) {
-          return _this12.deparse(e, 'from');
+          return _this11.deparse(e, 'from');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -2028,7 +2064,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.valuesLists) {
         output.push('VALUES');
         var lists = node.valuesLists.map(function (list) {
-          return "(".concat(_this12.list(list, ', ', '', context), ")");
+          return "(".concat(_this11.list(list, ', ', '', context), ")");
         });
         output.push(lists.join(', '));
       }
@@ -2036,7 +2072,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.groupClause) {
         output.push('GROUP BY');
         output.push(indent(node.groupClause.map(function (e) {
-          return _this12.deparse(e, 'group');
+          return _this11.deparse(e, 'group');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -2067,7 +2103,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.sortClause) {
         output.push('ORDER BY');
         output.push(indent(node.sortClause.map(function (e) {
-          return _this12.deparse(e, 'sort');
+          return _this11.deparse(e, 'sort');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -2083,13 +2119,30 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.lockingClause) {
         node.lockingClause.forEach(function (item) {
-          return output.push(_this12.deparse(item, context));
+          return output.push(_this11.deparse(item, context));
         });
       }
 
       return output.join(' ');
     }
   }, {
+    key: 'TruncateStmt',
+    value: function TruncateStmt(node) {
+      var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var output = ['TRUNCATE TABLE'];
+      output.push(this.list(node.relations, ', ', '', 'truncate'));
+
+      if (node.restart_seqs) {
+        output.push('RESTART IDENTITY');
+      }
+
+      if (node.behavior === 'DROP_CASCADE') {
+        output.push('CASCADE');
+      }
+
+      return output.join(' ');
+    }
+  }, {
     key: 'AlterDefaultPrivilegesStmt',
     value: function AlterDefaultPrivilegesStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -2393,7 +2446,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateExtensionStmt',
     value: function CreateExtensionStmt(node) {
-      var _this13 = this;
+      var _this12 = this;
 
       var output = [];
       output.push('CREATE EXTENSION');
@@ -2412,7 +2465,7 @@ var Deparser = /*#__PURE__*/function () {
 
           if (opt.DefElem.defname === 'schema') {
             output.push('WITH SCHEMA');
-            output.push(_this13.quote(_this13.deparse(opt.DefElem.arg)));
+            output.push(_this12.quote(_this12.deparse(opt.DefElem.arg)));
           }
         });
       }
@@ -2612,16 +2665,35 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
       output.push('CREATE');
       if (node.replace) output.push('OR REPLACE');
+
+      if (node.view.relpersistence === 't') {
+        output.push('TEMPORARY');
+      }
+
       output.push('VIEW');
-      output.push(this.RangeVar(node.view, context));
+      output.push(this.RangeVar(node.view, 'view'));
+
+      if (node.aliases) {
+        output.push('(');
+        output.push(this.list(node.aliases, ', ', '', context));
+        output.push(')');
+      }
+
       output.push('AS');
       output.push(this.deparse(node.query, context));
+
+      if (node.withCheckOption === 'LOCAL_CHECK_OPTION') {
+        output.push('WITH LOCAL CHECK OPTION');
+      } else if (node.withCheckOption === 'CASCADED_CHECK_OPTION') {
+        output.push('WITH CASCADED CHECK OPTION');
+      }
+
       return output.join(' ');
     }
   }, {
     key: 'CreateSeqStmt',
     value: function CreateSeqStmt(node) {
-      var _this14 = this;
+      var _this13 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2630,7 +2702,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.options && node.options.length) {
         node.options.forEach(function (opt) {
-          output.push(_this14.deparse(opt, 'sequence'));
+          output.push(_this13.deparse(opt, 'sequence'));
         });
       }
 
@@ -2639,7 +2711,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'AlterSeqStmt',
     value: function AlterSeqStmt(node) {
-      var _this15 = this;
+      var _this14 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2648,7 +2720,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.options && node.options.length) {
         node.options.forEach(function (opt) {
-          output.push(_this15.deparse(opt, 'sequence'));
+          output.push(_this14.deparse(opt, 'sequence'));
         });
       }
 
@@ -2658,8 +2730,19 @@ var Deparser = /*#__PURE__*/function () {
     key: 'CreateTableAsStmt',
     value: function CreateTableAsStmt(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      var output = [];
-      output.push('CREATE MATERIALIZED VIEW');
+      var output = ['CREATE'];
+      var relpersistence = dotty.get(node, 'into.rel.relpersistence');
+
+      if (node.relkind === 'OBJECT_MATVIEW') {
+        output.push('MATERIALIZED VIEW');
+      } else if (relpersistence !== 't') {
+        output.push('TABLE');
+
+        if (node.if_not_exists) {
+          output.push('IF NOT EXISTS');
+        }
+      }
+
       output.push(this.IntoClause(node.into, context));
       output.push('AS');
       output.push(this.deparse(node.query, context));
@@ -2668,7 +2751,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateTrigStmt',
     value: function CreateTrigStmt(node) {
-      var _this16 = this;
+      var _this15 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2787,7 +2870,7 @@ var Deparser = /*#__PURE__*/function () {
           return "'".concat(dotty.get(arg, 'String.str'), "'");
         }
 
-        return _this16.deparse(arg, context);
+        return _this15.deparse(arg, context);
       }).filter(function (a) {
         return a;
       });
@@ -2833,7 +2916,7 @@ var Deparser = /*#__PURE__*/function () {
       output.push(this.list(node.tableElts, ",".concat(NEWLINE_CHAR), TAB_CHAR, context));
       output.push("".concat(NEWLINE_CHAR, ")"));
 
-      if (relpersistence === 'p' && node.hasOwnProperty('inhRelations')) {
+      if (node.hasOwnProperty('inhRelations')) {
         output.push('INHERITS');
         output.push('(');
         output.push(this.list(node.inhRelations, ', ', '', context));
@@ -2950,17 +3033,17 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
 
       function getExclusionGroup(nde) {
-        var _this17 = this;
+        var _this16 = this;
 
         var a = nde.exclusions.map(function (excl) {
           if (excl[0].IndexElem.name) {
             return excl[0].IndexElem.name;
           }
 
-          return excl[0].IndexElem.expr ? _this17.deparse(excl[0].IndexElem.expr, context) : null;
+          return excl[0].IndexElem.expr ? _this16.deparse(excl[0].IndexElem.expr, context) : null;
         });
         var b = nde.exclusions.map(function (excl) {
-          return _this17.deparse(excl[1][0], context);
+          return _this16.deparse(excl[1][0], context);
         });
         var stmts = a.map(function (_v, i) {
           return "".concat(a[i], " WITH ").concat(b[i]);
@@ -3178,7 +3261,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateFunctionStmt',
     value: function CreateFunctionStmt(node) {
-      var _this18 = this;
+      var _this17 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3190,7 +3273,7 @@ var Deparser = /*#__PURE__*/function () {
 
       output.push('FUNCTION');
       output.push(node.funcname.map(function (name) {
-        return _this18.deparse(name, context);
+        return _this17.deparse(name, context);
       }).join('.'));
       output.push('(');
       var parameters = [];
@@ -3227,12 +3310,12 @@ var Deparser = /*#__PURE__*/function () {
 
           switch (option.DefElem.defname) {
             case 'as':
-              value = _this18.deparse(option.DefElem.arg[0], context);
+              value = _this17.deparse(option.DefElem.arg[0], context);
               output.push("AS $EOFCODE$".concat(value, "$EOFCODE$"));
               break;
 
             case 'language':
-              value = _this18.deparse(option.DefElem.arg, context);
+              value = _this17.deparse(option.DefElem.arg, context);
               output.push('LANGUAGE');
               output.push(value);
               break;
@@ -3279,11 +3362,11 @@ var Deparser = /*#__PURE__*/function () {
               break;
 
             case 'set':
-              output.push(_this18.deparse(option, context));
+              output.push(_this17.deparse(option, context));
               break;
 
             case 'volatility':
-              value = _this18.deparse(option.DefElem.arg, context);
+              value = _this17.deparse(option.DefElem.arg, context);
               output.push(value.toUpperCase());
               break;
 
@@ -3480,7 +3563,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateRoleStmt',
     value: function CreateRoleStmt(node) {
-      var _this19 = this;
+      var _this18 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3541,12 +3624,12 @@ var Deparser = /*#__PURE__*/function () {
 
             case 'adminmembers':
               output.push('ADMIN');
-              output.push(_this19.list(node.options[i].DefElem.arg, ', ', '', context));
+              output.push(_this18.list(node.options[i].DefElem.arg, ', ', '', context));
               break;
 
             case 'rolemembers':
               output.push('USER');
-              output.push(_this19.list(node.options[i].DefElem.arg, ', ', '', context));
+              output.push(_this18.list(node.options[i].DefElem.arg, ', ', '', context));
               break;
 
             case 'createdb':
@@ -3589,7 +3672,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'TransactionStmt',
     value: function TransactionStmt(node) {
-      var _this20 = this;
+      var _this19 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3601,7 +3684,7 @@ var Deparser = /*#__PURE__*/function () {
           var index = opts.indexOf('transaction_read_only');
           var obj = nodeOpts.options[index];
           var set = false;
-          var flag = Number(_this20.deparse(dotty.get(obj, 'DefElem.arg'), context));
+          var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
 
           if (flag > 0) {
             set = true;
@@ -3619,7 +3702,7 @@ var Deparser = /*#__PURE__*/function () {
 
           var _obj = nodeOpts.options[_index];
 
-          var lopts = _this20.deparse(dotty.get(_obj, 'DefElem.arg'), context).replace(/['"]+/g, '');
+          var lopts = _this19.deparse(dotty.get(_obj, 'DefElem.arg'), context).replace(/['"]+/g, '');
 
           return "BEGIN TRANSACTION ISOLATION LEVEL ".concat(lopts.toUpperCase());
         }
@@ -3634,7 +3717,7 @@ var Deparser = /*#__PURE__*/function () {
           var index = opts.indexOf('transaction_read_only');
           var obj = nodeOpts.options[index];
           var set = false;
-          var flag = Number(_this20.deparse(dotty.get(obj, 'DefElem.arg'), context));
+          var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
 
           if (flag > 0) {
             set = true;
@@ -3738,7 +3821,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'ObjectWithArgs',
     value: function ObjectWithArgs(node) {
-      var _this21 = this;
+      var _this20 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3756,7 +3839,7 @@ var Deparser = /*#__PURE__*/function () {
             return 'NONE';
           }
 
-          return _this21.deparse(arg, context);
+          return _this20.deparse(arg, context);
         }).join(','));
         output.push(')');
       } else if (!node.args_unspecified) {
@@ -3835,7 +3918,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'TypeName',
     value: function TypeName(node) {
-      var _this22 = this;
+      var _this21 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -3853,7 +3936,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.typmods != null) {
         args = node.typmods.map(function (item) {
-          return _this22.deparse(item, context);
+          return _this21.deparse(item, context);
         });
       }
 
@@ -3880,7 +3963,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'WindowDef',
     value: function WindowDef(node) {
-      var _this23 = this;
+      var _this22 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3904,7 +3987,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.partitionClause) {
         var partition = ['PARTITION BY'];
         var clause = node.partitionClause.map(function (item) {
-          return _this23.deparse(item, context);
+          return _this22.deparse(item, context);
         });
         partition.push(clause.join(', '));
         windowParts.push(partition.join(' '));
@@ -3914,7 +3997,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.orderClause) {
         windowParts.push('ORDER BY');
         var orders = node.orderClause.map(function (item) {
-          return _this23.deparse(item);
+          return _this22.deparse(item);
         });
         windowParts.push(orders.join(', '));
         useParens = true;
@@ -4121,7 +4204,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: "deparseInterval",
     value: function deparseInterval(node) {
-      var _this24 = this;
+      var _this23 = this;
 
       var type = ['interval'];
 
@@ -4131,7 +4214,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.typmods) {
         var typmods = node.typmods.map(function (item) {
-          return _this24.deparse(item);
+          return _this23.deparse(item);
         });
         var intervals = this.interval(typmods[0]); // SELECT interval(0) '1 day 01:23:45.6789'
 

package/module/deparser.js

@@ -90,6 +90,10 @@ export default class Deparser {
     });
   }
 
+  deparseReturningList(list, context) {
+    return list.map(returning => this.deparse(returning.ResTarget.val, context) + (returning.ResTarget.name ? ' AS ' + this.quote(returning.ResTarget.name) : '')).join(',');
+  }
+
   list(nodes, separator = ', ', prefix = '', context) {
     if (!nodes) {
       return '';
@@ -267,15 +271,15 @@ export default class Deparser {
     output.push('TO');
     output.push(this.RangeVar(node.relation, context));
 
-    if (node.instead) {
-      output.push('DO');
-      output.push('INSTEAD');
-    }
-
     if (node.whereClause) {
       output.push('WHERE');
       output.push(this.deparse(node.whereClause, context));
-      output.push('DO');
+    }
+
+    output.push('DO');
+
+    if (node.instead) {
+      output.push('INSTEAD');
     }
 
     if (!node.actions || !node.actions.length) {
@@ -924,7 +928,8 @@ export default class Deparser {
     output.push(node.ctename);
 
     if (node.aliascolnames) {
-      output.push(format('(%s)', this.quote(this.deparseNodes(node.aliascolnames, context))));
+      const colnames = this.quote(this.deparseNodes(node.aliascolnames, context));
+      output.push(`(${colnames.join(', ')})`);
     }
 
     output.push(format('AS (%s)', this.deparse(node.ctequery)));
@@ -1126,6 +1131,10 @@ export default class Deparser {
           }
 
       }
+    } else if (context === 'explain') {
+      if (node.arg) {
+        return `${name} ${this.deparse(node.arg)}`;
+      }
     } else if (node.arg) {
       return `${name} = ${this.deparse(node.arg, context)}`;
     }
@@ -1309,6 +1318,11 @@ export default class Deparser {
 
   ['InsertStmt'](node, context = {}) {
     const output = [];
+
+    if (node.withClause) {
+      output.push(this.WithClause(node.withClause, context));
+    }
+
     output.push('INSERT INTO');
     output.push(this.RangeVar(node.relation, context));
 
@@ -1354,7 +1368,7 @@ export default class Deparser {
 
     if (node.returningList) {
       output.push('RETURNING');
-      output.push(node.returningList.map(returning => this.deparse(returning.ResTarget.val, context) + (returning.ResTarget.name ? ' AS ' + this.quote(returning.ResTarget.name) : '')).join(','));
+      output.push(this.deparseReturningList(node.returningList, context));
     }
 
     return output.join(' ');
@@ -1372,20 +1386,40 @@ export default class Deparser {
 
   ['DeleteStmt'](node, context = {}) {
     const output = [''];
+
+    if (node.withClause) {
+      output.push(this.WithClause(node.withClause, context));
+    }
+
     output.push('DELETE');
     output.push('FROM');
     output.push(this.RangeVar(node.relation, context));
 
+    if (node.usingClause) {
+      output.push('USING');
+      output.push(this.list(node.usingClause, ', ', '', context));
+    }
+
     if (node.whereClause) {
       output.push('WHERE');
       output.push(this.deparse(node.whereClause, context));
     }
 
+    if (node.returningList) {
+      output.push('RETURNING');
+      output.push(this.deparseReturningList(node.returningList, context));
+    }
+
     return output.join(' ');
   }
 
   ['UpdateStmt'](node, context = {}) {
     const output = [];
+
+    if (node.withClause) {
+      output.push(this.WithClause(node.withClause, context));
+    }
+
     output.push('UPDATE');
 
     if (node.relation) {
@@ -1419,7 +1453,7 @@ export default class Deparser {
 
     if (node.returningList) {
       output.push('RETURNING');
-      output.push(node.returningList.map(returning => this.deparse(returning.ResTarget.val, context) + (returning.ResTarget.name ? ' AS ' + this.quote(returning.ResTarget.name) : '')).join(','));
+      output.push(this.deparseReturningList(node.returningList, context));
     }
 
     return output.join(' ');
@@ -1545,9 +1579,9 @@ export default class Deparser {
 
   ['LockStmt'](node, context = {}) {
     const output = ['LOCK'];
-    output.push(node.relations.map(e => this.deparse(e, {
+    output.push(this.list(node.relations, ', ', '', {
       lock: true
-    })).join(', '));
+    }));
     output.push('IN');
     output.push(LOCK_MODES[node.mode]);
     output.push('MODE');
@@ -1693,7 +1727,7 @@ export default class Deparser {
       output.push('ONLY');
     }
 
-    if (!node.inh && context.lock) {
+    if (!node.inh && (context.lock || context === 'truncate')) {
       output.push('ONLY');
     }
 
@@ -1701,7 +1735,7 @@ export default class Deparser {
       output.push('UNLOGGED');
     }
 
-    if (node.relpersistence === 't') {
+    if (node.relpersistence === 't' && context !== 'view') {
       output.push('TEMPORARY TABLE');
     }
 
@@ -1741,6 +1775,13 @@ export default class Deparser {
   ['ExplainStmt'](node, context = {}) {
     const output = [];
     output.push('EXPLAIN');
+
+    if (node.options) {
+      output.push('(');
+      output.push(this.list(node.options, ', ', '', 'explain'));
+      output.push(')');
+    }
+
     output.push(this.deparse(node.query, context));
     return output.join(' ');
   }
@@ -1879,6 +1920,21 @@ export default class Deparser {
     return output.join(' ');
   }
 
+  ['TruncateStmt'](node, context = {}) {
+    const output = ['TRUNCATE TABLE'];
+    output.push(this.list(node.relations, ', ', '', 'truncate'));
+
+    if (node.restart_seqs) {
+      output.push('RESTART IDENTITY');
+    }
+
+    if (node.behavior === 'DROP_CASCADE') {
+      output.push('CASCADE');
+    }
+
+    return output.join(' ');
+  }
+
   ['AlterDefaultPrivilegesStmt'](node, context = {}) {
     const output = [];
     output.push('ALTER DEFAULT PRIVILEGES');
@@ -2375,10 +2431,29 @@ export default class Deparser {
     const output = [];
     output.push('CREATE');
     if (node.replace) output.push('OR REPLACE');
+
+    if (node.view.relpersistence === 't') {
+      output.push('TEMPORARY');
+    }
+
     output.push('VIEW');
-    output.push(this.RangeVar(node.view, context));
+    output.push(this.RangeVar(node.view, 'view'));
+
+    if (node.aliases) {
+      output.push('(');
+      output.push(this.list(node.aliases, ', ', '', context));
+      output.push(')');
+    }
+
     output.push('AS');
     output.push(this.deparse(node.query, context));
+
+    if (node.withCheckOption === 'LOCAL_CHECK_OPTION') {
+      output.push('WITH LOCAL CHECK OPTION');
+    } else if (node.withCheckOption === 'CASCADED_CHECK_OPTION') {
+      output.push('WITH CASCADED CHECK OPTION');
+    }
+
     return output.join(' ');
   }
 
@@ -2411,8 +2486,19 @@ export default class Deparser {
   }
 
   ['CreateTableAsStmt'](node, context = {}) {
-    const output = [];
-    output.push('CREATE MATERIALIZED VIEW');
+    const output = ['CREATE'];
+    const relpersistence = dotty.get(node, 'into.rel.relpersistence');
+
+    if (node.relkind === 'OBJECT_MATVIEW') {
+      output.push('MATERIALIZED VIEW');
+    } else if (relpersistence !== 't') {
+      output.push('TABLE');
+
+      if (node.if_not_exists) {
+        output.push('IF NOT EXISTS');
+      }
+    }
+
     output.push(this.IntoClause(node.into, context));
     output.push('AS');
     output.push(this.deparse(node.query, context));
@@ -2576,7 +2662,7 @@ export default class Deparser {
     output.push(this.list(node.tableElts, `,${NEWLINE_CHAR}`, TAB_CHAR, context));
     output.push(`${NEWLINE_CHAR})`);
 
-    if (relpersistence === 'p' && node.hasOwnProperty('inhRelations')) {
+    if (node.hasOwnProperty('inhRelations')) {
       output.push('INHERITS');
       output.push('(');
       output.push(this.list(node.inhRelations, ', ', '', context));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "13.3.11",
+  "version": "13.3.12",
   "description": "PostgreSQL AST Deparser",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/pgsql-parser",
@@ -65,7 +65,7 @@
     "eslint-plugin-prettier": "^3.1.2",
     "glob": "7.1.6",
     "jest": "^25.1.0",
-    "pgsql-parser": "^13.3.11",
+    "pgsql-parser": "^13.3.12",
     "prettier": "^2.1.2",
     "regenerator-runtime": "^0.13.2"
   },
@@ -73,7 +73,7 @@
     "@babel/runtime": "^7.11.2",
     "dotty": "^0.1.0",
     "lodash": "^4.17.20",
-    "pgsql-enums": "^13.1.2"
+    "pgsql-enums": "^13.1.3"
   },
-  "gitHead": "3000794fa5f3a0e3e0d3a05cb1cee76f99124557"
+  "gitHead": "b6691acf4c2c12f1285ea04f60603cf3aceee95e"
 }