@dbml/core 2.4.3 → 2.4.4

package/lib/export/PostgresExporter.js

@@ -63,9 +63,12 @@ var PostgresExporter = /*#__PURE__*/function () {
         var line = '';
 
         if (field.increment) {
-          var typeSerial = 'SERIAL';
-          if (field.type.type_name.toLowerCase() === 'bigint') typeSerial = 'BIGSERIAL';else if (field.type.type_name.toLowerCase() === 'smallserial') typeSerial = 'SMALLSERIAL';
-          line = "\"".concat(field.name, "\" ").concat(typeSerial);
+          var typicalIntergers = new Set(['BIGINT', 'INT', 'INTEGER', 'SMALLINT']);
+          var incrementIntergers = new Set(['SMALLSERIAL', 'SERIAL', 'BIGSERIAL']);
+          var typeRaw = field.type.type_name.toUpperCase();
+          var type = '';
+          if (typicalIntergers.has(typeRaw)) type = "".concat(typeRaw, " GENERATED BY DEFAULT AS IDENTITY");else if (incrementIntergers.has(typeRaw)) type = typeRaw;else type = 'SERIAL';
+          line = "\"".concat(field.name, "\" ").concat(type);
         } else {
           var schemaName = '';
 

package/lib/parse/mysql/parser.pegjs

@@ -190,7 +190,7 @@ UniqueSyntax
 // "KEY is normally a synonym for INDEX".
 IndexInLineSyntax = _ unique:index_in_line
 	_ name:name? _ type1:index_type? _
-	"(" _ columns:IndexColumnValues _")" IndexOption? type2:index_type?
+	"(" _ columns:IndexColumnValues _")" type2:(_ IndexOption)?
 {
 	const index = { columns };
 	if(name) {
@@ -199,9 +199,8 @@ IndexInLineSyntax = _ unique:index_in_line
 	if(unique) {
 		index.unique = true;
 	}
-	const type = type2 || type1;
-	if(type)
-		index.type = type;
+	if(type2 && type2[1] && type2[1].type === 'index_type' && type2[1].value ) index.type = type2[1].value;
+	else if(type1) index.type = type1;
 	return index;
 }
 index_in_line // keyword
@@ -257,6 +256,7 @@ FieldSetting "field setting"
     ) { return "not_supported" }
 	/ _ v:Default {return {type: "default", value: v} }
 	/ _ v:Comment { return {type: "comment", value: v }}
+	/ _ "ON"i _ "UPDATE"i _ type { return "not_supported" }
 
 // Default: Support "DEFAULT (value|expr)" syntax
 Default

package/lib/parse/mysqlParser.js

@@ -357,8 +357,7 @@ function peg$parse(input, options) {
       index.unique = true;
     }
 
-    var type = type2 || type1;
-    if (type) index.type = type;
+    if (type2 && type2[1] && type2[1].type === 'index_type' && type2[1].value) index.type = type2[1].value;else if (type1) index.type = type1;
     return index;
   },
       peg$c30 = "index",
@@ -2428,7 +2427,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseIndexInLineSyntax() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
     s0 = peg$currPos;
     s1 = peg$parse_();
 
@@ -2492,27 +2491,32 @@ function peg$parse(input, options) {
                           }
 
                           if (s12 !== peg$FAILED) {
-                            s13 = peg$parseIndexOption();
+                            s13 = peg$currPos;
+                            s14 = peg$parse_();
+
+                            if (s14 !== peg$FAILED) {
+                              s15 = peg$parseIndexOption();
+
+                              if (s15 !== peg$FAILED) {
+                                s14 = [s14, s15];
+                                s13 = s14;
+                              } else {
+                                peg$currPos = s13;
+                                s13 = peg$FAILED;
+                              }
+                            } else {
+                              peg$currPos = s13;
+                              s13 = peg$FAILED;
+                            }
 
                             if (s13 === peg$FAILED) {
                               s13 = null;
                             }
 
                             if (s13 !== peg$FAILED) {
-                              s14 = peg$parseindex_type();
-
-                              if (s14 === peg$FAILED) {
-                                s14 = null;
-                              }
-
-                              if (s14 !== peg$FAILED) {
-                                peg$savedPos = s0;
-                                s1 = peg$c29(s2, s4, s6, s10, s14);
-                                s0 = s1;
-                              } else {
-                                peg$currPos = s0;
-                                s0 = peg$FAILED;
-                              }
+                              peg$savedPos = s0;
+                              s1 = peg$c29(s2, s4, s6, s10, s13);
+                              s0 = s1;
                             } else {
                               peg$currPos = s0;
                               s0 = peg$FAILED;
@@ -3689,6 +3693,73 @@ 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) {
+                        if (input.substr(peg$currPos, 2).toLowerCase() === peg$c17) {
+                          s2 = input.substr(peg$currPos, 2);
+                          peg$currPos += 2;
+                        } else {
+                          s2 = peg$FAILED;
+
+                          if (peg$silentFails === 0) {
+                            peg$fail(peg$c18);
+                          }
+                        }
+
+                        if (s2 !== peg$FAILED) {
+                          s3 = peg$parse_();
+
+                          if (s3 !== peg$FAILED) {
+                            if (input.substr(peg$currPos, 6).toLowerCase() === peg$c19) {
+                              s4 = input.substr(peg$currPos, 6);
+                              peg$currPos += 6;
+                            } else {
+                              s4 = peg$FAILED;
+
+                              if (peg$silentFails === 0) {
+                                peg$fail(peg$c20);
+                              }
+                            }
+
+                            if (s4 !== peg$FAILED) {
+                              s5 = peg$parse_();
+
+                              if (s5 !== peg$FAILED) {
+                                s6 = peg$parsetype();
+
+                                if (s6 !== peg$FAILED) {
+                                  peg$savedPos = s0;
+                                  s1 = peg$c79();
+                                  s0 = s1;
+                                } else {
+                                  peg$currPos = s0;
+                                  s0 = peg$FAILED;
+                                }
+                              } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                              }
+                            } else {
+                              peg$currPos = s0;
+                              s0 = peg$FAILED;
+                            }
+                          } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                          }
+                        } else {
+                          peg$currPos = s0;
+                          s0 = peg$FAILED;
+                        }
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
+                    }
                   }
                 }
               }