@dbml/core 2.5.4 → 2.6.1

package/lib/parse/ANTLR/parsers/postgresql/README.md

@@ -0,0 +1,10 @@
+Based on: https://github.com/antlr/grammars-v4/tree/master/sql/postgresql
+
+These folder contain base classes, grammar files and auto-generated parser.
+
+* PostgreSQLLexer.g4: lexer definition - copied from antlr/grammars-v4 repo
+* PostgreSQLParser.g4: grammar definition - copied from antlr/grammars-v4 repo
+* PostgreSQLLexer.interp, PostgreSQLLexer.js, PostgreSQLLexer.tokens, PostgreSQLParser.interp, PostgreSQLParser.js, PostgreSQLParser.tokens, PostgreSQLParserVisitor.js: Auto generated by the grammar
+* PostgreSQLLexerBase.js, PostgreSQLParserBase.js: Contain simple base classes and helper funtions required by the grammar.
+
+You don't need to touch these files unless you're planning on updating the grammar. In that case, read the setup guide to know more.

package/lib/parse/Parser.js

@@ -10,6 +10,7 @@ var _postgresParser = _interopRequireDefault(require("./postgresParser"));
 var _dbmlParser = _interopRequireDefault(require("./dbmlParser"));
 var _schemarbParser = _interopRequireDefault(require("./schemarbParser"));
 var _mssqlParser = _interopRequireDefault(require("./mssqlParser"));
+var _ASTGeneration = require("./ANTLR/ASTGeneration");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -32,6 +33,11 @@ var Parser = /*#__PURE__*/function () {
     value: function parseMySQLToJSON(str) {
       return _mysqlParser["default"].parse(str);
     }
+  }, {
+    key: "parsePostgresToJSONv2",
+    value: function parsePostgresToJSONv2(str) {
+      return (0, _ASTGeneration.parse)(str, 'postgres');
+    }
   }, {
     key: "parsePostgresToJSON",
     value: function parsePostgresToJSON(str) {
@@ -61,6 +67,9 @@ var Parser = /*#__PURE__*/function () {
           rawDatabase = Parser.parseMySQLToJSON(str);
           break;
         case 'postgres':
+          rawDatabase = Parser.parsePostgresToJSONv2(str);
+          break;
+        case 'postgresLegacy':
           rawDatabase = Parser.parsePostgresToJSON(str);
           break;
         case 'dbml':

package/lib/parse/dbml/parser.pegjs

@@ -532,8 +532,7 @@ CompositeIndex
 }
 
 IndexSettings
-  = "[" sp* pk sp* "]" { return { pk: true } }
-  / "[" first:IndexSetting rest:(Comma IndexSetting)* "]" {
+  = "[" first:IndexSetting rest:(Comma IndexSetting)* "]" {
     let arrSettings = [first].concat(rest.map(el => el[1]));
         let res = {};
     arrSettings.forEach((ele) => {
@@ -552,6 +551,7 @@ IndexSetting
   / _ v:IndexName _ { return { type: 'name', value: v } }
   / _ v:IndexType _ { return { type: 'type', value: v } }
   / _ v:ObjectNote _ { return { type: 'note', value: v } }
+  / _ pk _ { return { type: 'pk', value: true } }
 IndexName
   = "name:"i _ val:StringLiteral { return val.value }
 ObjectNoteElement

package/lib/parse/dbmlParser.js

@@ -624,12 +624,7 @@ function peg$parse(input, options) {
       }));
       return arrIndex;
     },
-    peg$c84 = function peg$c84() {
-      return {
-        pk: true
-      };
-    },
-    peg$c85 = function peg$c85(first, rest) {
+    peg$c84 = function peg$c84(first, rest) {
       var arrSettings = [first].concat(rest.map(function (el) {
         return el[1];
       }));
@@ -643,18 +638,24 @@ function peg$parse(input, options) {
       });
       return res;
     },
-    peg$c86 = function peg$c86(v) {
+    peg$c85 = function peg$c85(v) {
       return {
         type: 'name',
         value: v
       };
     },
-    peg$c87 = function peg$c87(v) {
+    peg$c86 = function peg$c86(v) {
       return {
         type: 'type',
         value: v
       };
     },
+    peg$c87 = function peg$c87() {
+      return {
+        type: 'pk',
+        value: true
+      };
+    },
     peg$c88 = "name:",
     peg$c89 = peg$literalExpectation("name:", true),
     peg$c90 = function peg$c90(val) {
@@ -3800,70 +3801,26 @@ function peg$parse(input, options) {
       }
     }
     if (s1 !== peg$FAILED) {
-      s2 = [];
-      s3 = peg$parsesp();
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
-        s3 = peg$parsesp();
-      }
+      s2 = peg$parseIndexSetting();
       if (s2 !== peg$FAILED) {
-        s3 = peg$parsepk();
-        if (s3 !== peg$FAILED) {
-          s4 = [];
-          s5 = peg$parsesp();
-          while (s5 !== peg$FAILED) {
-            s4.push(s5);
-            s5 = peg$parsesp();
-          }
-          if (s4 !== peg$FAILED) {
-            if (input.charCodeAt(peg$currPos) === 93) {
-              s5 = peg$c35;
-              peg$currPos++;
-            } else {
-              s5 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$c36);
-              }
-            }
-            if (s5 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c84();
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
+        s3 = [];
+        s4 = peg$currPos;
+        s5 = peg$parseComma();
+        if (s5 !== peg$FAILED) {
+          s6 = peg$parseIndexSetting();
+          if (s6 !== peg$FAILED) {
+            s5 = [s5, s6];
+            s4 = s5;
           } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
+            peg$currPos = s4;
+            s4 = peg$FAILED;
           }
         } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    if (s0 === peg$FAILED) {
-      s0 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 91) {
-        s1 = peg$c33;
-        peg$currPos++;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) {
-          peg$fail(peg$c34);
+          peg$currPos = s4;
+          s4 = peg$FAILED;
         }
-      }
-      if (s1 !== peg$FAILED) {
-        s2 = peg$parseIndexSetting();
-        if (s2 !== peg$FAILED) {
-          s3 = [];
+        while (s4 !== peg$FAILED) {
+          s3.push(s4);
           s4 = peg$currPos;
           s5 = peg$parseComma();
           if (s5 !== peg$FAILED) {
@@ -3879,42 +3836,21 @@ function peg$parse(input, options) {
             peg$currPos = s4;
             s4 = peg$FAILED;
           }
-          while (s4 !== peg$FAILED) {
-            s3.push(s4);
-            s4 = peg$currPos;
-            s5 = peg$parseComma();
-            if (s5 !== peg$FAILED) {
-              s6 = peg$parseIndexSetting();
-              if (s6 !== peg$FAILED) {
-                s5 = [s5, s6];
-                s4 = s5;
-              } else {
-                peg$currPos = s4;
-                s4 = peg$FAILED;
-              }
-            } else {
-              peg$currPos = s4;
-              s4 = peg$FAILED;
+        }
+        if (s3 !== peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 93) {
+            s4 = peg$c35;
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$c36);
             }
           }
-          if (s3 !== peg$FAILED) {
-            if (input.charCodeAt(peg$currPos) === 93) {
-              s4 = peg$c35;
-              peg$currPos++;
-            } else {
-              s4 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$c36);
-              }
-            }
-            if (s4 !== peg$FAILED) {
-              peg$savedPos = s0;
-              s1 = peg$c85(s2, s3);
-              s0 = s1;
-            } else {
-              peg$currPos = s0;
-              s0 = peg$FAILED;
-            }
+          if (s4 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c84(s2, s3);
+            s0 = s1;
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -3927,6 +3863,9 @@ function peg$parse(input, options) {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
     }
     return s0;
   }
@@ -3971,7 +3910,7 @@ function peg$parse(input, options) {
           s3 = peg$parse_();
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c86(s2);
+            s1 = peg$c85(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -3994,7 +3933,7 @@ function peg$parse(input, options) {
             s3 = peg$parse_();
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c87(s2);
+              s1 = peg$c86(s2);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -4031,6 +3970,30 @@ function peg$parse(input, options) {
             peg$currPos = s0;
             s0 = peg$FAILED;
           }
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parse_();
+            if (s1 !== peg$FAILED) {
+              s2 = peg$parsepk();
+              if (s2 !== peg$FAILED) {
+                s3 = peg$parse_();
+                if (s3 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$c87();
+                  s0 = s1;
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          }
         }
       }
     }

package/lib/parse/mysql/parser.pegjs

@@ -456,8 +456,8 @@ ListOfNames = first:name rest:(comma _ name)*
 
 // Comment Syntax: Support "COMMENT 'this is a comment'"
 Comment 
-	= "COMMENT" _ ("=" _)? comment: "'" c:[^']* "'" {return c.join('')}
-	/ "COMMENT" _ ("=" _)? comment: "\"" c:[^"]* "\"" {return c.join('')}
+	= "COMMENT"i _ ("=" _)? comment: "'" c:[^']* "'" {return c.join('')}
+	/ "COMMENT"i _ ("=" _)? comment: "\"" c:[^"]* "\"" {return c.join('')}
 // 			End of Useful Expression