pgsql-deparser 13.3.10 → 13.3.13

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.3.13](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.12...pgsql-deparser@13.3.13) (2022-08-31)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
+## [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
+
+
+
+
+
 ## [13.3.10](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.9...pgsql-deparser@13.3.10) (2022-05-19)
 
 **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

@@ -45,7 +45,18 @@ var fail = function fail(type, node) {
 }; // select word from pg_get_keywords() where catcode = 'R';
 
 
-var RESERVED_WORDS = ['all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both', 'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog', 'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially', 'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp', 'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary', 'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic', 'when', 'where', 'window', 'with'];
+var RESERVED_WORDS = ['all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both', 'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog', 'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially', 'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp', 'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary', 'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic', 'when', 'where', 'window', 'with']; // https://github.com/pganalyze/libpg_query/blob/b2790f8140721ff7f047167ecd7d44267b0a3880/src/postgres/include/storage/lockdefs.h
+
+var LOCK_MODES = {
+  1: 'ACCESS SHARE',
+  2: 'ROW SHARE',
+  3: 'ROW EXCLUSIVE',
+  4: 'SHARE UPDATE EXCLUSIVE',
+  5: 'SHARE',
+  6: 'SHARE ROW',
+  7: 'EXCLUSIVE',
+  8: 'ACCESS EXCLUSIVE'
+};
 
 var isReserved = function isReserved(value) {
   return RESERVED_WORDS.includes(value.toLowerCase());
@@ -113,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) {
@@ -131,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;
@@ -149,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);
         });
       }
 
@@ -218,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],
@@ -325,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) {
@@ -909,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('.');
     }
@@ -1027,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)));
@@ -1140,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] : {};
 
@@ -1215,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('.'));
             }
@@ -1237,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));
       }
@@ -1261,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 = [];
@@ -1269,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(*)
 
@@ -1435,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));
 
@@ -1484,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(' ');
@@ -1509,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(' ');
     }
   }, {
@@ -1527,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) {
@@ -1564,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(' ');
@@ -1699,6 +1743,24 @@ var Deparser = /*#__PURE__*/function () {
       return output.join(' ');
     }
   }, {
+    key: 'LockStmt',
+    value: function LockStmt(node) {
+      var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var output = ['LOCK'];
+      output.push(this.list(node.relations, ', ', '', {
+        lock: true
+      }));
+      output.push('IN');
+      output.push(LOCK_MODES[node.mode]);
+      output.push('MODE');
+
+      if (node.nowait) {
+        output.push('NOWAIT');
+      }
+
+      return output.join(' ');
+    }
+  }, {
     key: 'MinMaxExpr',
     value: function MinMaxExpr(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -1847,17 +1909,17 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.inhOpt === 0) {
         output.push('ONLY');
-      } // TODO why does this seem to be what we really need vs the above?
-      // if (!node.inh) {
-      //   output.push('ONLY');
-      // }
+      }
 
+      if (!node.inh && (context.lock || context === 'truncate')) {
+        output.push('ONLY');
+      }
 
       if (node.relpersistence === 'u') {
         output.push('UNLOGGED');
       }
 
-      if (node.relpersistence === 't') {
+      if (node.relpersistence === 't' && context !== 'view') {
         output.push('TEMPORARY TABLE');
       }
 
@@ -1905,6 +1967,13 @@ 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(' ');
     }
@@ -2057,6 +2126,23 @@ var Deparser = /*#__PURE__*/function () {
       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] : {};
@@ -2579,10 +2665,29 @@ 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(' ');
     }
   }, {
@@ -2625,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));
@@ -2800,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));

package/module/deparser.js

@@ -22,7 +22,18 @@ const fail = (type, node) => {
 }; // select word from pg_get_keywords() where catcode = 'R';
 
 
-const RESERVED_WORDS = ['all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both', 'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog', 'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially', 'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp', 'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary', 'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic', 'when', 'where', 'window', 'with'];
+const RESERVED_WORDS = ['all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric', 'both', 'case', 'cast', 'check', 'collate', 'column', 'constraint', 'create', 'current_catalog', 'current_date', 'current_role', 'current_time', 'current_timestamp', 'current_user', 'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false', 'fetch', 'for', 'foreign', 'from', 'grant', 'group', 'having', 'in', 'initially', 'intersect', 'into', 'lateral', 'leading', 'limit', 'localtime', 'localtimestamp', 'not', 'null', 'offset', 'on', 'only', 'or', 'order', 'placing', 'primary', 'references', 'returning', 'select', 'session_user', 'some', 'symmetric', 'table', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using', 'variadic', 'when', 'where', 'window', 'with']; // https://github.com/pganalyze/libpg_query/blob/b2790f8140721ff7f047167ecd7d44267b0a3880/src/postgres/include/storage/lockdefs.h
+
+const LOCK_MODES = {
+  1: 'ACCESS SHARE',
+  2: 'ROW SHARE',
+  3: 'ROW EXCLUSIVE',
+  4: 'SHARE UPDATE EXCLUSIVE',
+  5: 'SHARE',
+  6: 'SHARE ROW',
+  7: 'EXCLUSIVE',
+  8: 'ACCESS EXCLUSIVE'
+};
 
 const isReserved = value => RESERVED_WORDS.includes(value.toLowerCase()); // usually the AST lowercases all the things, so if we
 // have both, the author most likely used double quotes
@@ -79,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 '';
@@ -256,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) {
@@ -913,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)));
@@ -1115,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)}`;
     }
@@ -1298,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));
 
@@ -1343,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(' ');
@@ -1361,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) {
@@ -1408,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(' ');
@@ -1532,6 +1577,22 @@ export default class Deparser {
     return output.join(' ');
   }
 
+  ['LockStmt'](node, context = {}) {
+    const output = ['LOCK'];
+    output.push(this.list(node.relations, ', ', '', {
+      lock: true
+    }));
+    output.push('IN');
+    output.push(LOCK_MODES[node.mode]);
+    output.push('MODE');
+
+    if (node.nowait) {
+      output.push('NOWAIT');
+    }
+
+    return output.join(' ');
+  }
+
   ['MinMaxExpr'](node, context = {}) {
     const output = [];
 
@@ -1664,17 +1725,17 @@ export default class Deparser {
 
     if (node.inhOpt === 0) {
       output.push('ONLY');
-    } // TODO why does this seem to be what we really need vs the above?
-    // if (!node.inh) {
-    //   output.push('ONLY');
-    // }
+    }
 
+    if (!node.inh && (context.lock || context === 'truncate')) {
+      output.push('ONLY');
+    }
 
     if (node.relpersistence === 'u') {
       output.push('UNLOGGED');
     }
 
-    if (node.relpersistence === 't') {
+    if (node.relpersistence === 't' && context !== 'view') {
       output.push('TEMPORARY TABLE');
     }
 
@@ -1714,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(' ');
   }
@@ -1852,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');
@@ -2348,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(' ');
   }
 
@@ -2384,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));
@@ -2549,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.10",
+  "version": "13.3.13",
   "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.10",
+    "pgsql-parser": "^13.3.13",
     "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": "330bf9929afa01f21e7e19136045bbbf48af7e98"
+  "gitHead": "6161588d5b59842d0b5281e8819ddf363a3e3aea"
 }