pgsql-deparser 13.3.3 → 13.3.6

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.6](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.5...pgsql-deparser@13.3.6) (2022-04-19)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
+## [13.3.5](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.4...pgsql-deparser@13.3.5) (2022-04-19)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
+## [13.3.4](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.3...pgsql-deparser@13.3.4) (2022-04-19)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
 ## [13.3.3](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.3.2...pgsql-deparser@13.3.3) (2022-04-19)
 
 **Note:** Version bump only for package pgsql-deparser

package/main/deparser.js

@@ -1412,9 +1412,18 @@ var Deparser = /*#__PURE__*/function () {
     key: 'IndexElem',
     value: function IndexElem(node) {
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var output = [];
 
       if (node.name) {
-        return node.name;
+        output.push(node.name);
+
+        if (node.ordering === 'SORTBY_DESC') {
+          output.push('DESC');
+        } else if (node.ordering === 'SORTBY_ASC') {
+          output.push('ASC');
+        }
+
+        return output.join(' ');
       }
 
       if (node.expr) {
@@ -2351,6 +2360,8 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateExtensionStmt',
     value: function CreateExtensionStmt(node) {
+      var _this12 = this;
+
       var output = [];
       output.push('CREATE EXTENSION');
 
@@ -2365,6 +2376,11 @@ var Deparser = /*#__PURE__*/function () {
           if (opt.DefElem.defname === 'cascade' && opt.DefElem.arg.Integer.ival === 1) {
             output.push('CASCADE');
           }
+
+          if (opt.DefElem.defname === 'schema') {
+            output.push('WITH SCHEMA');
+            output.push(_this12.quote(_this12.deparse(opt.DefElem.arg)));
+          }
         });
       }
 
@@ -2572,7 +2588,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateSeqStmt',
     value: function CreateSeqStmt(node) {
-      var _this12 = this;
+      var _this13 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2581,7 +2597,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.options && node.options.length) {
         node.options.forEach(function (opt) {
-          output.push(_this12.deparse(opt, 'sequence'));
+          output.push(_this13.deparse(opt, 'sequence'));
         });
       }
 
@@ -2590,7 +2606,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'AlterSeqStmt',
     value: function AlterSeqStmt(node) {
-      var _this13 = this;
+      var _this14 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2599,7 +2615,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'));
         });
       }
 
@@ -2619,7 +2635,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateTrigStmt',
     value: function CreateTrigStmt(node) {
-      var _this14 = this;
+      var _this15 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -2738,7 +2754,7 @@ var Deparser = /*#__PURE__*/function () {
           return "'".concat(dotty.get(arg, 'String.str'), "'");
         }
 
-        return _this14.deparse(arg, context);
+        return _this15.deparse(arg, context);
       }).filter(function (a) {
         return a;
       });
@@ -2897,17 +2913,17 @@ var Deparser = /*#__PURE__*/function () {
       var output = [];
 
       function getExclusionGroup(nde) {
-        var _this15 = 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 ? _this15.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 _this15.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]);
@@ -3125,7 +3141,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateFunctionStmt',
     value: function CreateFunctionStmt(node) {
-      var _this16 = this;
+      var _this17 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3137,7 +3153,7 @@ var Deparser = /*#__PURE__*/function () {
 
       output.push('FUNCTION');
       output.push(node.funcname.map(function (name) {
-        return _this16.deparse(name, context);
+        return _this17.deparse(name, context);
       }).join('.'));
       output.push('(');
       var parameters = [];
@@ -3174,12 +3190,12 @@ var Deparser = /*#__PURE__*/function () {
 
           switch (option.DefElem.defname) {
             case 'as':
-              value = _this16.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 = _this16.deparse(option.DefElem.arg, context);
+              value = _this17.deparse(option.DefElem.arg, context);
               output.push('LANGUAGE');
               output.push(value);
               break;
@@ -3226,11 +3242,11 @@ var Deparser = /*#__PURE__*/function () {
               break;
 
             case 'set':
-              output.push(_this16.deparse(option, context));
+              output.push(_this17.deparse(option, context));
               break;
 
             case 'volatility':
-              value = _this16.deparse(option.DefElem.arg, context);
+              value = _this17.deparse(option.DefElem.arg, context);
               output.push(value.toUpperCase());
               break;
 
@@ -3427,7 +3443,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'CreateRoleStmt',
     value: function CreateRoleStmt(node) {
-      var _this17 = this;
+      var _this18 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3488,12 +3504,12 @@ var Deparser = /*#__PURE__*/function () {
 
             case 'adminmembers':
               output.push('ADMIN');
-              output.push(_this17.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(_this17.list(node.options[i].DefElem.arg, ', ', '', context));
+              output.push(_this18.list(node.options[i].DefElem.arg, ', ', '', context));
               break;
 
             case 'createdb':
@@ -3536,7 +3552,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'TransactionStmt',
     value: function TransactionStmt(node) {
-      var _this18 = this;
+      var _this19 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3548,7 +3564,7 @@ var Deparser = /*#__PURE__*/function () {
           var index = opts.indexOf('transaction_read_only');
           var obj = nodeOpts.options[index];
           var set = false;
-          var flag = Number(_this18.deparse(dotty.get(obj, 'DefElem.arg'), context));
+          var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
 
           if (flag > 0) {
             set = true;
@@ -3566,7 +3582,7 @@ var Deparser = /*#__PURE__*/function () {
 
           var _obj = nodeOpts.options[_index];
 
-          var lopts = _this18.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());
         }
@@ -3581,7 +3597,7 @@ var Deparser = /*#__PURE__*/function () {
           var index = opts.indexOf('transaction_read_only');
           var obj = nodeOpts.options[index];
           var set = false;
-          var flag = Number(_this18.deparse(dotty.get(obj, 'DefElem.arg'), context));
+          var flag = Number(_this19.deparse(dotty.get(obj, 'DefElem.arg'), context));
 
           if (flag > 0) {
             set = true;
@@ -3685,7 +3701,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'ObjectWithArgs',
     value: function ObjectWithArgs(node) {
-      var _this19 = this;
+      var _this20 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3703,7 +3719,7 @@ var Deparser = /*#__PURE__*/function () {
             return 'NONE';
           }
 
-          return _this19.deparse(arg, context);
+          return _this20.deparse(arg, context);
         }).join(','));
         output.push(')');
       }
@@ -3780,7 +3796,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'TypeName',
     value: function TypeName(node) {
-      var _this20 = this;
+      var _this21 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -3798,7 +3814,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.typmods != null) {
         args = node.typmods.map(function (item) {
-          return _this20.deparse(item, context);
+          return _this21.deparse(item, context);
         });
       }
 
@@ -3825,7 +3841,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: 'WindowDef',
     value: function WindowDef(node) {
-      var _this21 = this;
+      var _this22 = this;
 
       var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var output = [];
@@ -3849,7 +3865,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.partitionClause) {
         var partition = ['PARTITION BY'];
         var clause = node.partitionClause.map(function (item) {
-          return _this21.deparse(item, context);
+          return _this22.deparse(item, context);
         });
         partition.push(clause.join(', '));
         windowParts.push(partition.join(' '));
@@ -3859,7 +3875,7 @@ var Deparser = /*#__PURE__*/function () {
       if (node.orderClause) {
         windowParts.push('ORDER BY');
         var orders = node.orderClause.map(function (item) {
-          return _this21.deparse(item);
+          return _this22.deparse(item);
         });
         windowParts.push(orders.join(', '));
         useParens = true;
@@ -3907,6 +3923,23 @@ var Deparser = /*#__PURE__*/function () {
       return output.join(' ');
     }
   }, {
+    key: 'CallStmt',
+    value: function CallStmt(node) {
+      var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var output = ['CALL'];
+      output.push(this.deparse(node.funccall.funcname[0]));
+
+      if (node.funccall.args && node.funccall.args.length) {
+        // we have arguments
+        output.push('(' + this.list(node.funccall.args, ', ', '', context) + ')');
+      } else {
+        // just close parens
+        output.push('()');
+      }
+
+      return output.join(' ');
+    }
+  }, {
     key: "deparseFrameOptions",
     value: function deparseFrameOptions(options, refName, startOffset, endOffset) {
       // https://github.com/pganalyze/libpg_query/blob/442b1748d06364ecd3779bc558899176c02efaf0/src/postgres/include/nodes/parsenodes.h#L505-L522
@@ -4049,7 +4082,7 @@ var Deparser = /*#__PURE__*/function () {
   }, {
     key: "deparseInterval",
     value: function deparseInterval(node) {
-      var _this22 = this;
+      var _this23 = this;
 
       var type = ['interval'];
 
@@ -4059,7 +4092,7 @@ var Deparser = /*#__PURE__*/function () {
 
       if (node.typmods) {
         var typmods = node.typmods.map(function (item) {
-          return _this22.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

@@ -1275,8 +1275,18 @@ export default class Deparser {
   }
 
   ['IndexElem'](node, context = {}) {
+    const output = [];
+
     if (node.name) {
-      return node.name;
+      output.push(node.name);
+
+      if (node.ordering === 'SORTBY_DESC') {
+        output.push('DESC');
+      } else if (node.ordering === 'SORTBY_ASC') {
+        output.push('ASC');
+      }
+
+      return output.join(' ');
     }
 
     if (node.expr) {
@@ -2143,6 +2153,11 @@ export default class Deparser {
         if (opt.DefElem.defname === 'cascade' && opt.DefElem.arg.Integer.ival === 1) {
           output.push('CASCADE');
         }
+
+        if (opt.DefElem.defname === 'schema') {
+          output.push('WITH SCHEMA');
+          output.push(this.quote(this.deparse(opt.DefElem.arg)));
+        }
       });
     }
 
@@ -3582,6 +3597,21 @@ export default class Deparser {
     return output.join(' ');
   }
 
+  ['CallStmt'](node, context = {}) {
+    const output = ['CALL'];
+    output.push(this.deparse(node.funccall.funcname[0]));
+
+    if (node.funccall.args && node.funccall.args.length) {
+      // we have arguments
+      output.push('(' + this.list(node.funccall.args, ', ', '', context) + ')');
+    } else {
+      // just close parens
+      output.push('()');
+    }
+
+    return output.join(' ');
+  }
+
   deparseFrameOptions(options, refName, startOffset, endOffset) {
     // https://github.com/pganalyze/libpg_query/blob/442b1748d06364ecd3779bc558899176c02efaf0/src/postgres/include/nodes/parsenodes.h#L505-L522
     const FRAMEOPTION_NONDEFAULT = 0x00001;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "13.3.3",
+  "version": "13.3.6",
   "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.3",
+    "pgsql-parser": "^13.3.6",
     "prettier": "^2.1.2",
     "regenerator-runtime": "^0.13.2"
   },
@@ -75,5 +75,5 @@
     "lodash": "^4.17.20",
     "pgsql-enums": "^13.1.2"
   },
-  "gitHead": "33e5e0562136c7b84b476594298fbadc8cae957b"
+  "gitHead": "9e241dc39d3469afe7908cd7e2e9f847efa43f6f"
 }