pgsql-deparser 13.1.9 → 13.1.13

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [13.1.13](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.1.12...pgsql-deparser@13.1.13) (2022-01-07)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
+## [13.1.12](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.1.11...pgsql-deparser@13.1.12) (2022-01-05)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
+## [13.1.11](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.1.10...pgsql-deparser@13.1.11) (2021-10-19)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
+## [13.1.10](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.1.9...pgsql-deparser@13.1.10) (2021-10-19)
+
+**Note:** Version bump only for package pgsql-deparser
+
+
+
+
+
 ## [13.1.9](https://github.com/pyramation/pgsql-parser/compare/pgsql-deparser@13.1.8...pgsql-deparser@13.1.9) (2021-10-13)
 
 **Note:** Version bump only for package pgsql-deparser

package/main/deparser.js

@@ -27,7 +27,7 @@ var _pgsqlEnums = require("pgsql-enums");
 
 var _preparse = require("./preparse");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
@@ -1034,6 +1034,110 @@ var Deparser = /*#__PURE__*/function () {
       return output.join(' ');
     }
   }, {
+    key: 'DefineStmt',
+    value: function DefineStmt(node) {
+      var context = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var output = [];
+      output.push('CREATE');
+
+      if (node.replace) {
+        output.push('OR REPLACE');
+      }
+
+      switch (node.kind) {
+        case 'OBJECT_AGGREGATE':
+          output.push('AGGREGATE');
+          break;
+
+        case 'OBJECT_OPERATOR':
+          output.push('OPERATOR');
+          break;
+
+        case 'OBJECT_TYPE':
+          output.push('TYPE');
+          break;
+
+        case 'OBJECT_TSPARSER':
+          output.push('TEXT SEARCH PARSER');
+          break;
+
+        case 'OBJECT_TSDICTIONARY':
+          output.push('TEXT SEARCH DICTIONARY');
+          break;
+
+        case 'OBJECT_TSTEMPLATE':
+          output.push('TEXT SEARCH TEMPLATE');
+          break;
+
+        case 'OBJECT_TSCONFIGURATION':
+          output.push('TEXT SEARCH CONFIGURATION');
+          break;
+
+        case 'OBJECT_COLLATION':
+          output.push('COLLATION');
+          break;
+
+        default:
+          throw new Error('DefineStmt not recognized');
+      }
+
+      if (node.if_not_exists) {
+        output.push('IF NOT EXISTS');
+      }
+
+      switch (node.kind) {
+        case 'OBJECT_AGGREGATE':
+          // output.push(this.deparse(node.defnames));
+          output.push(this.list(node.defnames, '.', '', context));
+          break;
+
+        case 'OBJECT_OPERATOR':
+          output.push(this.list(node.defnames, '.', '', context)); // output.push(this.deparse(node.defnames));
+
+          break;
+
+        case 'OBJECT_TYPE':
+        case 'OBJECT_TSPARSER':
+        case 'OBJECT_TSDICTIONARY':
+        case 'OBJECT_TSTEMPLATE':
+        case 'OBJECT_TSCONFIGURATION':
+        case 'OBJECT_COLLATION':
+          output.push(this.deparse(node.defnames));
+          break;
+
+        default:
+          throw new Error('DefineStmt not recognized');
+      }
+
+      if (!node.oldstyle && node.kind == 'OBJECT_AGGREGATE') {
+        output.push('(');
+        output.push("".concat(this.listQuotes(node.args[0], ',')));
+        output.push(')');
+      }
+
+      if (node.definition.length > 0) {
+        output.push('(');
+
+        for (var n = 0; n < node.definition.length; n++) {
+          var defElement = node.definition[n].DefElem;
+          output.push(defElement.defname);
+
+          if (defElement.arg) {
+            output.push('=');
+            output.push(this.deparse(defElement.arg));
+          }
+
+          if (n !== node.definition.length - 1) {
+            output.push(',');
+          }
+        }
+
+        output.push(')');
+      }
+
+      return output.join(' ');
+    }
+  }, {
     key: 'DefElem',
     value: function DefElem(node) {
       var _this7 = this;
@@ -1062,7 +1166,7 @@ var Deparser = /*#__PURE__*/function () {
         name = "".concat(node.defnamespace, ".").concat(node.defname);
       }
 
-      if (context === 'generated') {
+      if (context === 'generated' || context === 'sequence') {
         switch (name) {
           case 'start':
             {
@@ -1073,16 +1177,20 @@ var Deparser = /*#__PURE__*/function () {
           case 'increment':
             {
               var inc = this.deparse(node.arg, context);
+
+              if (context === 'sequence') {
+                // we need 'simple' so it doesn't wrap negative numbers in parens
+                return "".concat(name, " ").concat(this.deparse(node.arg, 'simple'));
+              }
+
               return "INCREMENT BY ".concat(inc);
             }
 
-          default:
-            throw new Error('NOT_IMPLEMENTED');
-        }
-      }
+          case 'sequence_name':
+            {
+              return "SEQUENCE NAME ".concat(this.listQuotes(node.arg, '.'));
+            }
 
-      if (context === 'sequence') {
-        switch (name) {
           case 'cycle':
             {
               var on = this.deparse(node.arg, context) + '' === '1';
@@ -1107,17 +1215,12 @@ var Deparser = /*#__PURE__*/function () {
             {
               var output = [];
               node.arg.forEach(function (opt) {
-                output.push(_this7.quote(_this7.deparse(opt, 'sequence')));
+                output.push(_this7.quote(_this7.deparse(opt, context)));
               });
               return "OWNED BY ".concat(output.join('.'));
             }
           // alter
 
-          case 'start':
-            {
-              return "START WITH ".concat(this.deparse(node.arg, context));
-            }
-
           case 'restart':
             {
               if (node.arg) {
@@ -1847,12 +1950,12 @@ var Deparser = /*#__PURE__*/function () {
       if (node.distinctClause) {
         if (!isEmptyObject(node.distinctClause[0]) // new change distinctClause can be {}
         ) {
-          output.push('DISTINCT ON');
-          var clause = node.distinctClause.map(function (e) {
-            return _this11.deparse(e, 'select');
-          }).join(",".concat(NEWLINE_CHAR));
-          output.push("(".concat(clause, ")"));
-        } else {
+            output.push('DISTINCT ON');
+            var clause = node.distinctClause.map(function (e) {
+              return _this11.deparse(e, 'select');
+            }).join(",".concat(NEWLINE_CHAR));
+            output.push("(".concat(clause, ")"));
+          } else {
           output.push('DISTINCT');
         }
       }
@@ -2124,6 +2227,11 @@ var Deparser = /*#__PURE__*/function () {
         output.push('(');
         output.push(this.list(node.def, ', ', '', context));
         output.push(')');
+      } else if (node.subtype === 'AT_AddIdentity') {
+        output.push('ALTER COLUMN');
+        output.push(this.quote(node.name));
+        output.push('ADD');
+        output.push(this.deparse(node.def, context));
       } else if (node.subtype === 'AT_AddInherit') {
         output.push('INHERIT');
         output.push(this.deparse(node.def, context));

package/module/deparser.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
@@ -920,6 +920,108 @@ export default class Deparser {
     return output.join(' ');
   }
 
+  ['DefineStmt'](node, context = {}) {
+    const output = [];
+    output.push('CREATE');
+
+    if (node.replace) {
+      output.push('OR REPLACE');
+    }
+
+    switch (node.kind) {
+      case 'OBJECT_AGGREGATE':
+        output.push('AGGREGATE');
+        break;
+
+      case 'OBJECT_OPERATOR':
+        output.push('OPERATOR');
+        break;
+
+      case 'OBJECT_TYPE':
+        output.push('TYPE');
+        break;
+
+      case 'OBJECT_TSPARSER':
+        output.push('TEXT SEARCH PARSER');
+        break;
+
+      case 'OBJECT_TSDICTIONARY':
+        output.push('TEXT SEARCH DICTIONARY');
+        break;
+
+      case 'OBJECT_TSTEMPLATE':
+        output.push('TEXT SEARCH TEMPLATE');
+        break;
+
+      case 'OBJECT_TSCONFIGURATION':
+        output.push('TEXT SEARCH CONFIGURATION');
+        break;
+
+      case 'OBJECT_COLLATION':
+        output.push('COLLATION');
+        break;
+
+      default:
+        throw new Error('DefineStmt not recognized');
+    }
+
+    if (node.if_not_exists) {
+      output.push('IF NOT EXISTS');
+    }
+
+    switch (node.kind) {
+      case 'OBJECT_AGGREGATE':
+        // output.push(this.deparse(node.defnames));
+        output.push(this.list(node.defnames, '.', '', context));
+        break;
+
+      case 'OBJECT_OPERATOR':
+        output.push(this.list(node.defnames, '.', '', context)); // output.push(this.deparse(node.defnames));
+
+        break;
+
+      case 'OBJECT_TYPE':
+      case 'OBJECT_TSPARSER':
+      case 'OBJECT_TSDICTIONARY':
+      case 'OBJECT_TSTEMPLATE':
+      case 'OBJECT_TSCONFIGURATION':
+      case 'OBJECT_COLLATION':
+        output.push(this.deparse(node.defnames));
+        break;
+
+      default:
+        throw new Error('DefineStmt not recognized');
+    }
+
+    if (!node.oldstyle && node.kind == 'OBJECT_AGGREGATE') {
+      output.push('(');
+      output.push(`${this.listQuotes(node.args[0], ',')}`);
+      output.push(')');
+    }
+
+    if (node.definition.length > 0) {
+      output.push('(');
+
+      for (let n = 0; n < node.definition.length; n++) {
+        const defElement = node.definition[n].DefElem;
+        output.push(defElement.defname);
+
+        if (defElement.arg) {
+          output.push('=');
+          output.push(this.deparse(defElement.arg));
+        }
+
+        if (n !== node.definition.length - 1) {
+          output.push(',');
+        }
+      }
+
+      output.push(')');
+    }
+
+    return output.join(' ');
+  }
+
   ['DefElem'](node, context = {}) {
     if (node.defname === 'transaction_isolation') {
       return format('ISOLATION LEVEL %s', node.arg.A_Const.val.String.str.toUpperCase());
@@ -943,7 +1045,7 @@ export default class Deparser {
       name = `${node.defnamespace}.${node.defname}`;
     }
 
-    if (context === 'generated') {
+    if (context === 'generated' || context === 'sequence') {
       switch (name) {
         case 'start':
           {
@@ -954,16 +1056,20 @@ export default class Deparser {
         case 'increment':
           {
             const inc = this.deparse(node.arg, context);
+
+            if (context === 'sequence') {
+              // we need 'simple' so it doesn't wrap negative numbers in parens
+              return `${name} ${this.deparse(node.arg, 'simple')}`;
+            }
+
             return `INCREMENT BY ${inc}`;
           }
 
-        default:
-          throw new Error('NOT_IMPLEMENTED');
-      }
-    }
+        case 'sequence_name':
+          {
+            return `SEQUENCE NAME ${this.listQuotes(node.arg, '.')}`;
+          }
 
-    if (context === 'sequence') {
-      switch (name) {
         case 'cycle':
           {
             const on = this.deparse(node.arg, context) + '' === '1';
@@ -987,17 +1093,12 @@ export default class Deparser {
           {
             const output = [];
             node.arg.forEach(opt => {
-              output.push(this.quote(this.deparse(opt, 'sequence')));
+              output.push(this.quote(this.deparse(opt, context)));
             });
             return `OWNED BY ${output.join('.')}`;
           }
         // alter
 
-        case 'start':
-          {
-            return `START WITH ${this.deparse(node.arg, context)}`;
-          }
-
         case 'restart':
           {
             if (node.arg) {
@@ -1653,10 +1754,10 @@ export default class Deparser {
     if (node.distinctClause) {
       if (!isEmptyObject(node.distinctClause[0]) // new change distinctClause can be {}
       ) {
-        output.push('DISTINCT ON');
-        const clause = node.distinctClause.map(e => this.deparse(e, 'select')).join(`,${NEWLINE_CHAR}`);
-        output.push(`(${clause})`);
-      } else {
+          output.push('DISTINCT ON');
+          const clause = node.distinctClause.map(e => this.deparse(e, 'select')).join(`,${NEWLINE_CHAR}`);
+          output.push(`(${clause})`);
+        } else {
         output.push('DISTINCT');
       }
     }
@@ -1912,6 +2013,11 @@ export default class Deparser {
       output.push('(');
       output.push(this.list(node.def, ', ', '', context));
       output.push(')');
+    } else if (node.subtype === 'AT_AddIdentity') {
+      output.push('ALTER COLUMN');
+      output.push(this.quote(node.name));
+      output.push('ADD');
+      output.push(this.deparse(node.def, context));
     } else if (node.subtype === 'AT_AddInherit') {
       output.push('INHERIT');
       output.push(this.deparse(node.def, context));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "13.1.9",
+  "version": "13.1.13",
   "description": "PostgreSQL AST Deparser",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/pgsql-parser",
@@ -65,15 +65,15 @@
     "eslint-plugin-prettier": "^3.1.2",
     "glob": "7.1.6",
     "jest": "^25.1.0",
-    "pgsql-parser": "^13.1.9",
+    "pgsql-parser": "^13.1.13",
     "prettier": "^2.1.2",
     "regenerator-runtime": "^0.13.2"
   },
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "dotty": "0.1.0",
-    "lodash": "4.17.20",
+    "dotty": "^0.1.0",
+    "lodash": "^4.17.20",
     "pgsql-enums": "^13.1.2"
   },
-  "gitHead": "656c440ca3cf29f5b70681b52b53a92e4174f110"
+  "gitHead": "dae375591a9a48ee61ec7a8209362b22b4a645db"
 }