@dbml/core 2.4.2 → 2.4.4

package/lib/export/MysqlExporter.js

@@ -156,18 +156,18 @@ var MySQLExporter = /*#__PURE__*/function () {
     }
   }, {
     key: "buildTableManyToMany",
-    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName) {
-      var line = "CREATE TABLE `".concat(tableName, "` (\n");
+    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName, refEndpointSchema, model) {
+      var line = "CREATE TABLE ".concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "`".concat(refEndpointSchema.name, "`.") : '', "`").concat(tableName, "` (\n");
 
       var key1s = _toConsumableArray(firstTableFieldsMap.keys()).join('`, `');
 
       var key2s = _toConsumableArray(secondTableFieldsMap.keys()).join('`, `');
 
       firstTableFieldsMap.forEach(function (fieldType, fieldName) {
-        line += "  `".concat(fieldName, "` ").concat(fieldType, " NOT NULL,\n");
+        line += "  `".concat(fieldName, "` ").concat(fieldType, ",\n");
       });
       secondTableFieldsMap.forEach(function (fieldType, fieldName) {
-        line += "  `".concat(fieldName, "` ").concat(fieldType, " NOT NULL,\n");
+        line += "  `".concat(fieldName, "` ").concat(fieldType, ",\n");
       });
       line += "  PRIMARY KEY (`".concat(key1s, "`, `").concat(key2s, "`)\n");
       line += ');\n\n';
@@ -175,34 +175,15 @@ var MySQLExporter = /*#__PURE__*/function () {
     }
   }, {
     key: "buildForeignKeyManyToMany",
-    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, schema, model) {
+    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, refEndpointSchema, foreignEndpointSchema, model) {
       var refEndpointFields = _toConsumableArray(fieldsMap.keys()).join('`, `');
 
-      var line = "ALTER TABLE `".concat(refEndpointTableName, "` ADD FOREIGN KEY (`").concat(refEndpointFields, "`) REFERENCES ").concat((0, _utils.shouldPrintSchema)(schema, model) ? "`".concat(schema.name, "`.") : '', "`").concat(foreignEndpointTableName, "` ").concat(foreignEndpointFields, ";\n\n");
-      return line;
-    }
-  }, {
-    key: "buildIndexManytoMany",
-    value: function buildIndexManytoMany(fieldsMap, newTableName, tableRefName, usedIndexNames) {
-      var newIndexName = "".concat(newTableName, "_").concat(tableRefName);
-      var count = 1;
-
-      while (usedIndexNames.has(newIndexName)) {
-        newIndexName = "".concat(newTableName, "_").concat(tableRefName, "(").concat(count, ")");
-        count += 1;
-      }
-
-      usedIndexNames.add(newIndexName);
-
-      var indexFields = _toConsumableArray(fieldsMap.keys()).join('`, `');
-
-      var line = "CREATE INDEX `idx_".concat(newIndexName, "` ON `").concat(newTableName, "` (");
-      line += "`".concat(indexFields, "`);\n\n");
+      var line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "`".concat(refEndpointSchema.name, "`.") : '', "`").concat(refEndpointTableName, "` ADD FOREIGN KEY (`").concat(refEndpointFields, "`) REFERENCES ").concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "`".concat(foreignEndpointSchema.name, "`.") : '', "`").concat(foreignEndpointTableName, "` ").concat(foreignEndpointFields, ";\n\n");
       return line;
     }
   }, {
     key: "exportRefs",
-    value: function exportRefs(refIds, model, usedTableNames, usedIndexNames) {
+    value: function exportRefs(refIds, model, usedTableNames) {
       var _this = this;
 
       var strArr = refIds.map(function (refId) {
@@ -232,18 +213,9 @@ var MySQLExporter = /*#__PURE__*/function () {
           var firstTableFieldsMap = (0, _utils.buildJunctionFields1)(refEndpoint.fieldIds, model);
           var secondTableFieldsMap = (0, _utils.buildJunctionFields2)(foreignEndpoint.fieldIds, model, firstTableFieldsMap);
           var newTableName = (0, _utils.buildNewTableName)(refEndpointTable.name, foreignEndpointTable.name, usedTableNames);
-          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName);
-
-          if (firstTableFieldsMap.size > 1) {
-            line += _this.buildIndexManytoMany(firstTableFieldsMap, newTableName, refEndpointTable.name, usedIndexNames);
-          }
-
-          if (secondTableFieldsMap.size > 1) {
-            line += _this.buildIndexManytoMany(secondTableFieldsMap, newTableName, foreignEndpointTable.name, usedIndexNames);
-          }
-
-          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, model);
-          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, foreignEndpointSchema, model);
+          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, refEndpointSchema, foreignEndpointSchema, model);
         } else {
           line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "`".concat(foreignEndpointSchema.name, "`.") : '', "`").concat(foreignEndpointTable.name, "` ADD ");
 
@@ -333,9 +305,6 @@ var MySQLExporter = /*#__PURE__*/function () {
       var usedTableNames = new Set(Object.values(model.tables).map(function (table) {
         return table.name;
       }));
-      var usedIndexNames = new Set(Object.values(model.indexes).map(function (index) {
-        return index.name;
-      }));
       var statements = database.schemaIds.reduce(function (prevStatements, schemaId) {
         var schema = model.schemas[schemaId];
         var tableIds = schema.tableIds,
@@ -378,7 +347,7 @@ var MySQLExporter = /*#__PURE__*/function () {
         if (!_lodash["default"].isEmpty(refIds)) {
           var _prevStatements$refs;
 
-          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(MySQLExporter.exportRefs(refIds, model, usedTableNames, usedIndexNames)));
+          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(MySQLExporter.exportRefs(refIds, model, usedTableNames)));
         }
 
         return prevStatements;

package/lib/export/PostgresExporter.js

@@ -63,8 +63,12 @@ var PostgresExporter = /*#__PURE__*/function () {
         var line = '';
 
         if (field.increment) {
-          var typeSerial = field.type.type_name === 'bigint' ? 'BIGSERIAL' : 'SERIAL';
-          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 = '';
 
@@ -169,18 +173,18 @@ var PostgresExporter = /*#__PURE__*/function () {
     }
   }, {
     key: "buildTableManyToMany",
-    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName) {
-      var line = "CREATE TABLE \"".concat(tableName, "\" (\n");
+    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName, refEndpointSchema, model) {
+      var line = "CREATE TABLE ".concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "\"".concat(refEndpointSchema.name, "\".") : '', "\"").concat(tableName, "\" (\n");
 
       var key1s = _toConsumableArray(firstTableFieldsMap.keys()).join('", "');
 
       var key2s = _toConsumableArray(secondTableFieldsMap.keys()).join('", "');
 
       firstTableFieldsMap.forEach(function (fieldType, fieldName) {
-        line += "  \"".concat(fieldName, "\" ").concat(fieldType, " NOT NULL,\n");
+        line += "  \"".concat(fieldName, "\" ").concat(fieldType, ",\n");
       });
       secondTableFieldsMap.forEach(function (fieldType, fieldName) {
-        line += "  \"".concat(fieldName, "\" ").concat(fieldType, " NOT NULL,\n");
+        line += "  \"".concat(fieldName, "\" ").concat(fieldType, ",\n");
       });
       line += "  PRIMARY KEY (\"".concat(key1s, "\", \"").concat(key2s, "\")\n");
       line += ');\n\n';
@@ -188,34 +192,15 @@ var PostgresExporter = /*#__PURE__*/function () {
     }
   }, {
     key: "buildForeignKeyManyToMany",
-    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, schema, model) {
+    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, refEndpointSchema, foreignEndpointSchema, model) {
       var refEndpointFields = _toConsumableArray(fieldsMap.keys()).join('", "');
 
-      var line = "ALTER TABLE \"".concat(refEndpointTableName, "\" ADD FOREIGN KEY (\"").concat(refEndpointFields, "\") REFERENCES ").concat((0, _utils.shouldPrintSchema)(schema, model) ? "\"".concat(schema.name, "\".") : '', "\"").concat(foreignEndpointTableName, "\" ").concat(foreignEndpointFields, ";\n\n");
-      return line;
-    }
-  }, {
-    key: "buildIndexManytoMany",
-    value: function buildIndexManytoMany(fieldsMap, newTableName, tableRefName, usedIndexNames) {
-      var newIndexName = "".concat(newTableName, "_").concat(tableRefName);
-      var count = 1;
-
-      while (usedIndexNames.has(newIndexName)) {
-        newIndexName = "".concat(newTableName, "_").concat(tableRefName, "(").concat(count, ")");
-        count += 1;
-      }
-
-      usedIndexNames.add(newIndexName);
-
-      var indexFields = _toConsumableArray(fieldsMap.keys()).join('", "');
-
-      var line = "CREATE INDEX \"idx_".concat(newIndexName, "\" ON \"").concat(newTableName, "\" (");
-      line += "\"".concat(indexFields, "\");\n\n");
+      var line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "\"".concat(refEndpointSchema.name, "\".") : '', "\"").concat(refEndpointTableName, "\" ADD FOREIGN KEY (\"").concat(refEndpointFields, "\") REFERENCES ").concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "\"".concat(foreignEndpointSchema.name, "\".") : '', "\"").concat(foreignEndpointTableName, "\" ").concat(foreignEndpointFields, ";\n\n");
       return line;
     }
   }, {
     key: "exportRefs",
-    value: function exportRefs(refIds, model, usedTableNames, usedIndexNames) {
+    value: function exportRefs(refIds, model, usedTableNames) {
       var _this = this;
 
       var strArr = refIds.map(function (refId) {
@@ -246,18 +231,9 @@ var PostgresExporter = /*#__PURE__*/function () {
           var firstTableFieldsMap = (0, _utils.buildJunctionFields1)(refEndpoint.fieldIds, model);
           var secondTableFieldsMap = (0, _utils.buildJunctionFields2)(foreignEndpoint.fieldIds, model, firstTableFieldsMap);
           var newTableName = (0, _utils.buildNewTableName)(refEndpointTable.name, foreignEndpointTable.name, usedTableNames);
-          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName);
-
-          if (firstTableFieldsMap.size > 1) {
-            line += _this.buildIndexManytoMany(firstTableFieldsMap, newTableName, refEndpointTable.name, usedIndexNames);
-          }
-
-          if (secondTableFieldsMap.size > 1) {
-            line += _this.buildIndexManytoMany(secondTableFieldsMap, newTableName, foreignEndpointTable.name, usedIndexNames);
-          }
-
-          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, model);
-          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, foreignEndpointSchema, model);
+          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, refEndpointSchema, foreignEndpointSchema, model);
         } else {
           line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "\"".concat(foreignEndpointSchema.name, "\".") : '', "\"").concat(foreignEndpointTable.name, "\" ADD ");
 
@@ -368,9 +344,6 @@ var PostgresExporter = /*#__PURE__*/function () {
       var usedTableNames = new Set(Object.values(model.tables).map(function (table) {
         return table.name;
       }));
-      var usedIndexNames = new Set(Object.values(model.indexes).map(function (index) {
-        return index.name;
-      }));
       var statements = database.schemaIds.reduce(function (prevStatements, schemaId) {
         var schema = model.schemas[schemaId];
         var tableIds = schema.tableIds,
@@ -431,7 +404,7 @@ var PostgresExporter = /*#__PURE__*/function () {
         if (!_lodash["default"].isEmpty(refIds)) {
           var _prevStatements$refs;
 
-          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(PostgresExporter.exportRefs(refIds, model, usedTableNames, usedIndexNames)));
+          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(PostgresExporter.exportRefs(refIds, model, usedTableNames)));
         }
 
         return prevStatements;

package/lib/export/SqlServerExporter.js

@@ -145,18 +145,18 @@ var SqlServerExporter = /*#__PURE__*/function () {
     }
   }, {
     key: "buildTableManyToMany",
-    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName) {
-      var line = "CREATE TABLE [".concat(tableName, "] (\n");
+    value: function buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, tableName, refEndpointSchema, model) {
+      var line = "CREATE TABLE ".concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "[".concat(refEndpointSchema.name, "].") : '', "[").concat(tableName, "] (\n");
 
       var key1s = _toConsumableArray(firstTableFieldsMap.keys()).join('], [');
 
       var key2s = _toConsumableArray(secondTableFieldsMap.keys()).join('], [');
 
       firstTableFieldsMap.forEach(function (fieldType, fieldName) {
-        line += "  [".concat(fieldName, "] ").concat(fieldType, " NOT NULL,\n");
+        line += "  [".concat(fieldName, "] ").concat(fieldType, ",\n");
       });
       secondTableFieldsMap.forEach(function (fieldType, fieldName) {
-        line += "  [".concat(fieldName, "] ").concat(fieldType, " NOT NULL,\n");
+        line += "  [".concat(fieldName, "] ").concat(fieldType, ",\n");
       });
       line += "  PRIMARY KEY ([".concat(key1s, "], [").concat(key2s, "])\n");
       line += ');\nGO\n\n';
@@ -164,29 +164,10 @@ var SqlServerExporter = /*#__PURE__*/function () {
     }
   }, {
     key: "buildForeignKeyManyToMany",
-    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, schema, model) {
+    value: function buildForeignKeyManyToMany(fieldsMap, foreignEndpointFields, refEndpointTableName, foreignEndpointTableName, refEndpointSchema, foreignEndpointSchema, model) {
       var refEndpointFields = _toConsumableArray(fieldsMap.keys()).join('], [');
 
-      var line = "ALTER TABLE [".concat(refEndpointTableName, "] ADD FOREIGN KEY ([").concat(refEndpointFields, "]) REFERENCES ").concat((0, _utils.shouldPrintSchema)(schema, model) ? "[".concat(schema.name, "].") : '', "[").concat(foreignEndpointTableName, "] ").concat(foreignEndpointFields, ";\nGO\n\n");
-      return line;
-    }
-  }, {
-    key: "buildIndexManytoMany",
-    value: function buildIndexManytoMany(fieldsMap, newTableName, tableRefName, usedIndexNames) {
-      var newIndexName = "".concat(newTableName, "_").concat(tableRefName);
-      var count = 1;
-
-      while (usedIndexNames.has(newIndexName)) {
-        newIndexName = "".concat(newTableName, "_").concat(tableRefName, "(").concat(count, ")");
-        count += 1;
-      }
-
-      usedIndexNames.add(newIndexName);
-
-      var indexFields = _toConsumableArray(fieldsMap.keys()).join('", "');
-
-      var line = "CREATE INDEX [idx_".concat(newIndexName, "] ON [").concat(newTableName, "] (");
-      line += "\"".concat(indexFields, "\");\nGO\n\n");
+      var line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(refEndpointSchema, model) ? "[".concat(refEndpointSchema.name, "].") : '', "[").concat(refEndpointTableName, "] ADD FOREIGN KEY ([").concat(refEndpointFields, "]) REFERENCES ").concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "[".concat(foreignEndpointSchema.name, "].") : '', "[").concat(foreignEndpointTableName, "] ").concat(foreignEndpointFields, ";\nGO\n\n");
       return line;
     }
   }, {
@@ -199,7 +180,7 @@ var SqlServerExporter = /*#__PURE__*/function () {
     }
   }, {
     key: "exportRefs",
-    value: function exportRefs(refIds, model, usedTableNames, usedIndexNames) {
+    value: function exportRefs(refIds, model, usedTableNames) {
       var _this = this;
 
       var strArr = refIds.map(function (refId) {
@@ -230,18 +211,9 @@ var SqlServerExporter = /*#__PURE__*/function () {
           var firstTableFieldsMap = (0, _utils.buildJunctionFields1)(refEndpoint.fieldIds, model);
           var secondTableFieldsMap = (0, _utils.buildJunctionFields2)(foreignEndpoint.fieldIds, model, firstTableFieldsMap);
           var newTableName = (0, _utils.buildNewTableName)(refEndpointTable.name, foreignEndpointTable.name, usedTableNames);
-          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName);
-
-          if (firstTableFieldsMap.size > 1) {
-            line += _this.buildIndexManytoMany(firstTableFieldsMap, newTableName, refEndpointTable.name, usedIndexNames);
-          }
-
-          if (secondTableFieldsMap.size > 1) {
-            line += _this.buildIndexManytoMany(secondTableFieldsMap, newTableName, foreignEndpointTable.name, usedIndexNames);
-          }
-
-          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, model);
-          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, foreignEndpointSchema, model);
+          line += _this.buildTableManyToMany(firstTableFieldsMap, secondTableFieldsMap, newTableName, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(firstTableFieldsMap, refEndpointFieldName, newTableName, refEndpointTable.name, refEndpointSchema, refEndpointSchema, model);
+          line += _this.buildForeignKeyManyToMany(secondTableFieldsMap, foreignEndpointFieldName, newTableName, foreignEndpointTable.name, refEndpointSchema, foreignEndpointSchema, model);
         } else {
           line = "ALTER TABLE ".concat((0, _utils.shouldPrintSchema)(foreignEndpointSchema, model) ? "[".concat(foreignEndpointSchema.name, "].") : '', "[").concat(foreignEndpointTable.name, "] ADD ");
 
@@ -349,9 +321,6 @@ var SqlServerExporter = /*#__PURE__*/function () {
       var usedTableNames = new Set(Object.values(model.tables).map(function (table) {
         return table.name;
       }));
-      var usedIndexNames = new Set(Object.values(model.indexes).map(function (index) {
-        return index.name;
-      }));
       var statements = database.schemaIds.reduce(function (prevStatements, schemaId) {
         var schema = model.schemas[schemaId];
         var tableIds = schema.tableIds,
@@ -405,7 +374,7 @@ var SqlServerExporter = /*#__PURE__*/function () {
         if (!_lodash["default"].isEmpty(refIds)) {
           var _prevStatements$refs;
 
-          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(SqlServerExporter.exportRefs(refIds, model, usedTableNames, usedIndexNames)));
+          (_prevStatements$refs = prevStatements.refs).push.apply(_prevStatements$refs, _toConsumableArray(SqlServerExporter.exportRefs(refIds, model, usedTableNames)));
         }
 
         return prevStatements;

package/lib/model_structure/endpoint.js

@@ -15,6 +15,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 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; }
@@ -140,11 +152,35 @@ var Endpoint = /*#__PURE__*/function (_Element) {
     value: function setFields(fieldNames, table) {
       var _this2 = this;
 
-      fieldNames.forEach(function (fieldName) {
+      var newFieldNames = fieldNames && fieldNames.length ? _toConsumableArray(fieldNames) : [];
+
+      if (!newFieldNames.length) {
+        var fieldHasPK = table.fields.find(function (field) {
+          return field.pk;
+        });
+
+        if (fieldHasPK) {
+          newFieldNames.push(fieldHasPK.name);
+        } else {
+          var indexHasPK = table.indexes.find(function (index) {
+            return index.pk;
+          });
+
+          if (indexHasPK) {
+            newFieldNames = indexHasPK.columns.map(function (column) {
+              return column.value;
+            });
+          } else {
+            this.error("Can't find primary or composite key in table ".concat((0, _utils.shouldPrintSchema)(table.schema) ? "\"".concat(table.schema.name, "\".") : '', "\"").concat(table.name, "\""));
+          }
+        }
+      }
+
+      newFieldNames.forEach(function (fieldName) {
         var field = table.findField(fieldName);
 
         if (!field) {
-          _this2.error("Can't find field ".concat((0, _utils.shouldPrintSchema)(table.schema) ? "\"".concat(table.schema.name, "\".") : '', "\"").concat(fieldName, "\" in table \"").concat(_this2.tableName, "\""));
+          _this2.error("Can't find field ".concat((0, _utils.shouldPrintSchema)(table.schema) ? "\"".concat(table.schema.name, "\".") : '', "\"").concat(fieldName, "\" in table \"").concat(table.name, "\""));
         }
 
         _this2.fields.push(field);

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

@@ -51,12 +51,14 @@ function makeTableConstraintFK(_keyword1, endpoint1, _keyword2, tableName, endpo
   var fullTableName = getFullTableName(tableName);
 
   if (!endpoint2) {
+    // Omits columns list, see: https://docs.microsoft.com/en-us/sql/t-sql/statements/create-table-transact-sql?view=sql-server-ver16#foreign-key-constraints
     // eslint-disable-next-line no-param-reassign
     endpoint2 = {
       type: 'endpoint',
-      value: {}
+      value: {
+        fieldNames: null
+      }
     };
-    endpoint2.value.fieldNames = endpoint1.value.fieldNames;
   }
 
   endpoint1.value.relation = '*';

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;
+                      }
+                    }
                   }
                 }
               }