pgsql-deparser 13.3.10 → 13.3.11

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.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/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());
@@ -1699,6 +1710,28 @@ var Deparser = /*#__PURE__*/function () {
       return output.join(' ');
     }
   }, {
+    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('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,11 +1880,11 @@ 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) {
+        output.push('ONLY');
+      }
 
       if (node.relpersistence === 'u') {
         output.push('UNLOGGED');
@@ -1911,7 +1944,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'SelectStmt',
     value: function SelectStmt(node) {
-      var _this11 = this;
+      var _this12 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -1961,7 +1994,7 @@ var Deparser = /*#__PURE__*/function () {
         ) {
             output.push('DISTINCT ON');
             var clause = node.distinctClause.map(function (e) {
-              return _this11.deparse(e, 'select');
+              return _this12.deparse(e, 'select');
             }).join(",".concat(NEWLINE_CHAR));
             output.push("(".concat(clause, ")"));
           } else {
@@ -1971,7 +2004,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.targetList) {
         output.push(indent(node.targetList.map(function (e) {
-          return _this11.deparse(e, 'select');
+          return _this12.deparse(e, 'select');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -1983,7 +2016,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.fromClause) {
         output.push('FROM');
         output.push(indent(node.fromClause.map(function (e) {
-          return _this11.deparse(e, 'from');
+          return _this12.deparse(e, 'from');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -1995,7 +2028,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.valuesLists) {
         output.push('VALUES');
         var lists = node.valuesLists.map(function (list) {
-          return "(".concat(_this11.list(list, ', ', '', context), ")");
+          return "(".concat(_this12.list(list, ', ', '', context), ")");
         });
         output.push(lists.join(', '));
       }
@@ -2003,7 +2036,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.groupClause) {
         output.push('GROUP BY');
         output.push(indent(node.groupClause.map(function (e) {
-          return _this11.deparse(e, 'group');
+          return _this12.deparse(e, 'group');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -2034,7 +2067,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.sortClause) {
         output.push('ORDER BY');
         output.push(indent(node.sortClause.map(function (e) {
-          return _this11.deparse(e, 'sort');
+          return _this12.deparse(e, 'sort');
         }).join(",".concat(NEWLINE_CHAR))));
       }
 
@@ -2050,7 +2083,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.lockingClause) {
         node.lockingClause.forEach(function (item) {
-          return output.push(_this11.deparse(item, context));
+          return output.push(_this12.deparse(item, context));
         });
       }
 
@@ -2360,7 +2393,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateExtensionStmt',
     value: function CreateExtensionStmt(node) {
-      var _this12 = this;
+      var _this13 = this;
 
       var output = [];
       output.push('CREATE EXTENSION');
@@ -2379,7 +2412,7 @@ var Deparser = /*#__PURE__*/function () {
 
           if (opt.DefElem.defname === 'schema') {
             output.push('WITH SCHEMA');
-            output.push(_this12.quote(_this12.deparse(opt.DefElem.arg)));
+            output.push(_this13.quote(_this13.deparse(opt.DefElem.arg)));
           }
         });
       }
@@ -2588,7 +2621,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateSeqStmt',
     value: function CreateSeqStmt(node) {
-      var _this13 = this;
+      var _this14 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2597,7 +2630,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.options && node.options.length) {
         node.options.forEach(function (opt) {
-          output.push(_this13.deparse(opt, 'sequence'));
+          output.push(_this14.deparse(opt, 'sequence'));
         });
       }
 
@@ -2606,7 +2639,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'AlterSeqStmt',
     value: function AlterSeqStmt(node) {
-      var _this14 = this;
+      var _this15 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2615,7 +2648,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.options && node.options.length) {
         node.options.forEach(function (opt) {
-          output.push(_this14.deparse(opt, 'sequence'));
+          output.push(_this15.deparse(opt, 'sequence'));
         });
       }
 
@@ -2635,7 +2668,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateTrigStmt',
     value: function CreateTrigStmt(node) {
-      var _this15 = this;
+      var _this16 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2754,7 +2787,7 @@ var Deparser = /*#__PURE__*/function () {
           return "'".concat(dotty.get(arg, 'String.str'), "'");
         }
 
-        return _this15.deparse(arg, context);
+        return _this16.deparse(arg, context);
       }).filter(function (a) {
         return a;
       });
@@ -2917,17 +2950,17 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
 
       function getExclusionGroup(nde) {
-        var _this16 = this;
+        var _this17 = this;
 
         var a = nde.exclusions.map(function (excl) {
           if (excl[0].IndexElem.name) {
             return excl[0].IndexElem.name;
           }
 
-          return excl[0].IndexElem.expr ? _this16.deparse(excl[0].IndexElem.expr, context) : null;
+          return excl[0].IndexElem.expr ? _this17.deparse(excl[0].IndexElem.expr, context) : null;
         });
         var b = nde.exclusions.map(function (excl) {
-          return _this16.deparse(excl[1][0], context);
+          return _this17.deparse(excl[1][0], context);
         });
         var stmts = a.map(function (_v, i) {
           return "".concat(a[i], " WITH ").concat(b[i]);
@@ -3145,7 +3178,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateFunctionStmt',
     value: function CreateFunctionStmt(node) {
-      var _this17 = this;
+      var _this18 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3157,7 +3190,7 @@ var Deparser = /*#__PURE__*/function () {
 
       output.push('FUNCTION');
       output.push(node.funcname.map(function (name) {
-        return _this17.deparse(name, context);
+        return _this18.deparse(name, context);
       }).join('.'));
       output.push('(');
       var parameters = [];
@@ -3194,12 +3227,12 @@ var Deparser = /*#__PURE__*/function () {
 
           switch (option.DefElem.defname) {
             case 'as':
-              value = _this17.deparse(option.DefElem.arg[0], context);
+              value = _this18.deparse(option.DefElem.arg[0], context);
               output.push("AS $EOFCODE$".concat(value, "$EOFCODE$"));
               break;
 
             case 'language':
-              value = _this17.deparse(option.DefElem.arg, context);
+              value = _this18.deparse(option.DefElem.arg, context);
               output.push('LANGUAGE');
               output.push(value);
               break;
@@ -3246,11 +3279,11 @@ var Deparser = /*#__PURE__*/function () {
               break;
 
             case 'set':
-              output.push(_this17.deparse(option, context));
+              output.push(_this18.deparse(option, context));
               break;
 
             case 'volatility':
-              value = _this17.deparse(option.DefElem.arg, context);
+              value = _this18.deparse(option.DefElem.arg, context);
               output.push(value.toUpperCase());
               break;
 
@@ -3447,7 +3480,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateRoleStmt',
     value: function CreateRoleStmt(node) {
-      var _this18 = this;
+      var _this19 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3508,12 +3541,12 @@ var Deparser = /*#__PURE__*/function () {
 
             case 'adminmembers':
               output.push('ADMIN');
-              output.push(_this18.list(node.options[i].DefElem.arg, ', ', '', context));
+              output.push(_this19.list(node.options[i].DefElem.arg, ', ', '', context));
               break;
 
             case 'rolemembers':
               output.push('USER');
-              output.push(_this18.list(node.options[i].DefElem.arg, ', ', '', context));
+              output.push(_this19.list(node.options[i].DefElem.arg, ', ', '', context));
               break;
 
             case 'createdb':
@@ -3556,7 +3589,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'TransactionStmt',
     value: function TransactionStmt(node) {
-      var _this19 = this;
+      var _this20 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3568,7 +3601,7 @@ var Deparser = /*#__PURE__*/function () {
           var index = opts.indexOf('transaction_read_only');
           var obj = nodeOpts.options[index];
           var set = false;
-          var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
+          var flag = Number(_this20.deparse(dotty.get(obj, 'DefElem.arg'), context));
 
           if (flag > 0) {
             set = true;
@@ -3586,7 +3619,7 @@ var Deparser = /*#__PURE__*/function () {
 
           var _obj = nodeOpts.options[_index];
 
-          var lopts = _this19.deparse(dotty.get(_obj, 'DefElem.arg'), context).replace(/['"]+/g, '');
+          var lopts = _this20.deparse(dotty.get(_obj, 'DefElem.arg'), context).replace(/['"]+/g, '');
 
           return "BEGIN TRANSACTION ISOLATION LEVEL ".concat(lopts.toUpperCase());
         }
@@ -3601,7 +3634,7 @@ var Deparser = /*#__PURE__*/function () {
           var index = opts.indexOf('transaction_read_only');
           var obj = nodeOpts.options[index];
           var set = false;
-          var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
+          var flag = Number(_this20.deparse(dotty.get(obj, 'DefElem.arg'), context));
 
           if (flag > 0) {
             set = true;
@@ -3705,7 +3738,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'ObjectWithArgs',
     value: function ObjectWithArgs(node) {
-      var _this20 = this;
+      var _this21 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3723,7 +3756,7 @@ var Deparser = /*#__PURE__*/function () {
             return 'NONE';
           }
 
-          return _this20.deparse(arg, context);
+          return _this21.deparse(arg, context);
         }).join(','));
         output.push(')');
       } else if (!node.args_unspecified) {
@@ -3802,7 +3835,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'TypeName',
     value: function TypeName(node) {
-      var _this21 = this;
+      var _this22 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -3820,7 +3853,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.typmods != null) {
         args = node.typmods.map(function (item) {
-          return _this21.deparse(item, context);
+          return _this22.deparse(item, context);
         });
       }
 
@@ -3847,7 +3880,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'WindowDef',
     value: function WindowDef(node) {
-      var _this22 = this;
+      var _this23 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3871,7 +3904,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.partitionClause) {
         var partition = ['PARTITION BY'];
         var clause = node.partitionClause.map(function (item) {
-          return _this22.deparse(item, context);
+          return _this23.deparse(item, context);
         });
         partition.push(clause.join(', '));
         windowParts.push(partition.join(' '));
@@ -3881,7 +3914,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.orderClause) {
         windowParts.push('ORDER BY');
         var orders = node.orderClause.map(function (item) {
-          return _this22.deparse(item);
+          return _this23.deparse(item);
         });
         windowParts.push(orders.join(', '));
         useParens = true;
@@ -4088,7 +4121,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: "deparseInterval",
     value: function deparseInterval(node) {
-      var _this23 = this;
+      var _this24 = this;
 
       var type = ['interval'];
 
@@ -4098,7 +4131,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.typmods) {
         var typmods = node.typmods.map(function (item) {
-          return _this23.deparse(item);
+          return _this24.deparse(item);
         });
         var intervals = this.interval(typmods[0]); // SELECT interval(0) '1 day 01:23:45.6789'
 

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
@@ -1532,6 +1543,22 @@ export default class Deparser {
     return output.join(' ');
   }
 
+  ['LockStmt'](node, context = {}) {
+    const output = ['LOCK'];
+    output.push(node.relations.map(e => this.deparse(e, {
+      lock: true
+    })).join(', '));
+    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,11 +1691,11 @@ 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) {
+      output.push('ONLY');
+    }
 
     if (node.relpersistence === 'u') {
       output.push('UNLOGGED');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "13.3.10",
+  "version": "13.3.11",
   "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.11",
     "prettier": "^2.1.2",
     "regenerator-runtime": "^0.13.2"
   },
@@ -75,5 +75,5 @@
     "lodash": "^4.17.20",
     "pgsql-enums": "^13.1.2"
   },
-  "gitHead": "330bf9929afa01f21e7e19136045bbbf48af7e98"
+  "gitHead": "3000794fa5f3a0e3e0d3a05cb1cee76f99124557"
 }