@dbml/core 2.4.3 → 2.5.0

package/lib/parse/mssql/statements/actions.js

@@ -59,16 +59,14 @@ function handleEnums(_enum, ast) {
   }).join(', ');
 }
 
-function handleComment(comment, ast) {
-  if (comment.type === 'table') handleTableNote(comment, ast);else if (comment.type === 'column') handleFieldNote(comment, ast);
-}
-
 function handleTableNote(comment, ast) {
   var schemaName = comment.schemaName;
   if (schemaName === 'dbo') schemaName = null; // treat `dbo` as public schema
 
   var foundTable = findTable(ast, comment.tableName, schemaName);
-  if (foundTable) foundTable.note = comment.note;
+  if (foundTable) foundTable.note = comment.note ? {
+    value: comment.note
+  } : null;
 }
 
 function handleFieldNote(comment, ast) {
@@ -79,10 +77,16 @@ function handleFieldNote(comment, ast) {
 
   if (foundTable) {
     var foundField = findField(foundTable, comment.columnName);
-    if (foundField) foundField.note = comment.note;
+    if (foundField) foundField.note = comment.note ? {
+      value: comment.note
+    } : null;
   }
 }
 
+function handleComment(comment, ast) {
+  if (comment.type === 'table') handleTableNote(comment, ast);else if (comment.type === 'column') handleFieldNote(comment, ast);
+}
+
 function handleStatement(_statements) {
   var ast = {
     tables: [],

package/lib/parse/mssql/statements/statement_types/comments/actions.js

@@ -1,12 +1,32 @@
 "use strict";
 
+var isSchema = function isSchema(type) {
+  return type.toLowerCase() === 'schema';
+};
+
+var isTable = function isTable(type) {
+  return type.toLowerCase() === 'table';
+};
+
+var isColumn = function isColumn(type) {
+  return type.toLowerCase() === 'column';
+};
+
+var isValidTableNote = function isValidTableNote(level) {
+  return level.length === 2 && isSchema(level[0].type) && isTable(level[1].type);
+};
+
+var isValidColumnNote = function isValidColumnNote(level) {
+  return level.length === 3 && isSchema(level[0].type) && isTable(level[1].type) && isColumn(level[2].type);
+};
+
 function handleComment(_ref) {
   var note = _ref.note,
       level = _ref.level;
   var type = 'unsupported';
-  var schemaName = null,
-      tableName = null,
-      columnName = null;
+  var schemaName = null;
+  var tableName = null;
+  var columnName = null;
 
   if (isValidTableNote(level)) {
     schemaName = level[0].name;
@@ -32,26 +52,6 @@ function handleComment(_ref) {
   };
 }
 
-var isSchema = function isSchema(type) {
-  return type.toLowerCase() === 'schema';
-};
-
-var isTable = function isTable(type) {
-  return type.toLowerCase() === 'table';
-};
-
-var isColumn = function isColumn(type) {
-  return type.toLowerCase() === 'column';
-};
-
-var isValidTableNote = function isValidTableNote(level) {
-  return level.length === 2 && isSchema(level[0].type) && isTable(level[1].type);
-};
-
-var isValidColumnNote = function isValidColumnNote(level) {
-  return level.length === 3 && isSchema(level[0].type) && isTable(level[1].type) && isColumn(level[2].type);
-};
-
 module.exports = {
   handleComment: handleComment
 };

package/lib/parse/mysql/parser.pegjs

@@ -86,7 +86,7 @@ TableSyntax
 
   let res = {...table_name, fields};
 
-	if (options && options.comment) res.note = options.comment;
+	if (options && options.comment) res.note = { value: options.comment };
 	if (indexes) res.indexes = indexes;
 	// return statement
 	return res;
@@ -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
@@ -226,12 +225,12 @@ FieldSettings = fieldSettingsArray:FieldSetting*
 {
 	const fieldSettings = {};
 	fieldSettingsArray.forEach(field => {
-		if(field === "null")
+		if (field === "null")
 			fieldSettings["not_null"] = false;
-		else if(field.type === "default")
+		else if (field.type === "default" && field.value)
 			fieldSettings.dbdefault = field.value;
-		else if(field.type === "comment")
-			fieldSettings.note = field.value;
+		else if (field.type === "comment" && field.value)
+			fieldSettings.note = { value: field.value };
 		else if (field !== "not_supported") {
 			fieldSettings[field] = true;
 		}
@@ -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

@@ -197,7 +197,9 @@ function peg$parse(input, options) {
       fields: fields
     });
 
-    if (options && options.comment) res.note = options.comment;
+    if (options && options.comment) res.note = {
+      value: options.comment
+    };
     if (indexes) res.indexes = indexes; // return statement
 
     return res;
@@ -357,8 +359,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",
@@ -396,7 +397,9 @@ function peg$parse(input, options) {
       peg$c41 = function peg$c41(fieldSettingsArray) {
     var fieldSettings = {};
     fieldSettingsArray.forEach(function (field) {
-      if (field === "null") fieldSettings["not_null"] = false;else if (field.type === "default") fieldSettings.dbdefault = field.value;else if (field.type === "comment") fieldSettings.note = field.value;else if (field !== "not_supported") {
+      if (field === "null") fieldSettings["not_null"] = false;else if (field.type === "default" && field.value) fieldSettings.dbdefault = field.value;else if (field.type === "comment" && field.value) fieldSettings.note = {
+        value: field.value
+      };else if (field !== "not_supported") {
         fieldSettings[field] = true;
       }
     });
@@ -2428,7 +2431,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 +2495,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 +3697,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;
+                      }
+                    }
                   }
                 }
               }