@dbml/core 3.12.0-alpha-0 → 3.12.0

package/lib/model_structure/utils.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getFullTableName = getFullTableName;
 exports.shouldPrintSchema = shouldPrintSchema;
 exports.shouldPrintSchemaName = shouldPrintSchemaName;
 var _config = require("./config");
@@ -12,9 +11,4 @@ function shouldPrintSchema(schema) {
 }
 function shouldPrintSchemaName(schemaName) {
   return schemaName !== _config.DEFAULT_SCHEMA_NAME;
-}
-
-// TODO: This is an ad hoc function for parsing inserts. It should be replaced with a more robust solution
-function getFullTableName(schemaName, tableName) {
-  return "".concat(schemaName && shouldPrintSchemaName(schemaName) ? "".concat(schemaName, ".") : '').concat(tableName);
 }

package/lib/parse/ANTLR/ASTGeneration/AST.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Table = exports.Ref = exports.Index = exports.Field = exports.Enum = exports.Endpoint = void 0;
+exports.TableRecord = exports.Table = exports.Ref = exports.Index = exports.Field = exports.Enum = exports.Endpoint = void 0;
 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"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
@@ -290,4 +290,49 @@ var Enum = /*#__PURE__*/function () {
   }]);
   return Enum;
 }();
-exports.Enum = Enum;
+exports.Enum = Enum;
+var TableRecord = /*#__PURE__*/function () {
+  /**
+   * @param {{
+   *  tableName: string,
+   *  columns: string[],
+   *  values: {
+   *    value: any,
+   *    type: string,
+   *  }[]
+   *  schemaName?: string,
+   * }} param0
+   */
+  function TableRecord(_ref7) {
+    var tableName = _ref7.tableName,
+      columns = _ref7.columns,
+      values = _ref7.values,
+      _ref7$schemaName = _ref7.schemaName,
+      schemaName = _ref7$schemaName === void 0 ? undefined : _ref7$schemaName;
+    _classCallCheck(this, TableRecord);
+    /** @type {string} */
+    this.tableName = tableName;
+
+    /** @type {string | undefined} */
+    this.schemaName = schemaName;
+
+    /** @type {string[]} */
+    this.columns = columns;
+
+    /** @type {{value: any, type: string}[]} */
+    this.values = values;
+  }
+  _createClass(TableRecord, [{
+    key: "toJSON",
+    value: function toJSON() {
+      return {
+        tableName: this.tableName,
+        schemaName: this.schemaName,
+        columns: this.columns,
+        values: this.values
+      };
+    }
+  }]);
+  return TableRecord;
+}();
+exports.TableRecord = TableRecord;

package/lib/parse/ANTLR/ASTGeneration/mssql/MssqlASTGen.js

@@ -6,16 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _lodash = require("lodash");
-var _utils = require("../../../../model_structure/utils");
 var _TSqlParserVisitor2 = _interopRequireDefault(require("../../parsers/mssql/TSqlParserVisitor"));
 var _constants = require("../constants");
 var _helpers = require("../helpers");
 var _AST = require("../AST");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -28,6 +23,10 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
@@ -35,6 +34,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } /* eslint-disable class-methods-use-this */
 var ADD_DESCRIPTION_FUNCTION_NAME = 'sp_addextendedproperty';
+var CHECK_CONSTRAINT_CONDITION_TYPE = {
+  RAW: 'raw',
+  ENUM: 'enum'
+};
 var getSchemaAndTableName = function getSchemaAndTableName(names) {
   var tableName = (0, _lodash.last)(names);
   var schemaName = names.length > 1 ? (0, _lodash.nth)(names, -2) : undefined;
@@ -56,6 +59,8 @@ var getStringFromRawString = function getStringFromRawString(rawString) {
  *  fieldsData: any[],
  *  indexes: any[],
  *  tableRefs: any[],
+ *  columnDefaults: any[],
+ *  checkConstraints: any[],
  * }}
  */
 var splitColumnDefTableConstraints = function splitColumnDefTableConstraints(columnDefTableConstraints) {
@@ -75,25 +80,31 @@ var splitColumnDefTableConstraints = function splitColumnDefTableConstraints(col
         case _constants.TABLE_CONSTRAINT_KIND.DEFAULT:
           acc[3].push(columnDefTableConstraint.value);
           break;
+        case _constants.TABLE_CONSTRAINT_KIND.CHECK:
+          acc[4].push(columnDefTableConstraint.value);
+          break;
         default:
           break;
       }
       return acc;
-    }, [[], [], [], []]),
-    _columnDefTableConstr2 = _slicedToArray(_columnDefTableConstr, 4),
+    }, [[], [], [], [], []]),
+    _columnDefTableConstr2 = _slicedToArray(_columnDefTableConstr, 5),
     fieldsData = _columnDefTableConstr2[0],
     indexes = _columnDefTableConstr2[1],
     tableRefs = _columnDefTableConstr2[2],
-    columnDefaults = _columnDefTableConstr2[3];
+    columnDefaults = _columnDefTableConstr2[3],
+    checkConstraints = _columnDefTableConstr2[4];
   return {
     fieldsData: fieldsData,
     indexes: indexes,
     tableRefs: tableRefs,
-    columnDefaults: columnDefaults
+    columnDefaults: columnDefaults,
+    checkConstraints: checkConstraints
   };
 };
 var parseFieldsAndInlineRefsFromFieldsData = function parseFieldsAndInlineRefsFromFieldsData(fieldsData, tableName, schemaName) {
   var _fieldsData$reduce = fieldsData.reduce(function (acc, fieldData) {
+      var _acc$;
       var inlineRefs = fieldData.inline_refs.map(function (inlineRef) {
         inlineRef.endpoints[0].tableName = tableName;
         inlineRef.endpoints[0].schemaName = schemaName;
@@ -102,14 +113,17 @@ var parseFieldsAndInlineRefsFromFieldsData = function parseFieldsAndInlineRefsFr
       });
       acc[0].push(inlineRefs);
       acc[1].push(fieldData.field);
+      (_acc$ = acc[2]).push.apply(_acc$, _toConsumableArray(fieldData.checkConstraints));
       return acc;
-    }, [[], []]),
-    _fieldsData$reduce2 = _slicedToArray(_fieldsData$reduce, 2),
+    }, [[], [], []]),
+    _fieldsData$reduce2 = _slicedToArray(_fieldsData$reduce, 3),
     resInlineRefs = _fieldsData$reduce2[0],
-    fields = _fieldsData$reduce2[1];
+    fields = _fieldsData$reduce2[1],
+    checkConstraints = _fieldsData$reduce2[2];
   return {
     inlineRefs: resInlineRefs,
-    fields: fields
+    fields: fields,
+    checkConstraints: checkConstraints
   };
 };
 var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
@@ -222,12 +236,12 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       var schemaName = names.length > 1 ? (0, _lodash.nth)(names, -2) : undefined;
       var columns = ctx.insert_column_name_list() ? ctx.insert_column_name_list().accept(this) : [];
       var values = ctx.insert_statement_value().accept(this);
-      var record = {
-        schemaName: schemaName,
+      var record = new _AST.TableRecord({
         tableName: tableName,
+        schemaName: schemaName,
         columns: columns,
         values: values
-      };
+      });
       this.data.records.push(record);
     }
 
@@ -360,6 +374,9 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       if (ctx.bracket_expression()) {
         return ctx.bracket_expression().accept(this);
       }
+      if (ctx.full_column_name()) {
+        return ctx.full_column_name().accept(this);
+      }
 
       // Default case for any other expression type
       return {
@@ -378,6 +395,23 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       return ctx.expression() ? ctx.expression().accept(this) : null;
     }
 
+    // full_column_name
+    //   : ((DELETED | INSERTED | full_table_name) '.')? (
+    //       column_name = id_
+    //       | ('$' (IDENTITY | ROWGUID))
+    //   )
+    //   ;
+  }, {
+    key: "visitFull_column_name",
+    value: function visitFull_column_name(ctx) {
+      var columnName = ctx.id_().accept(this);
+      var fullTableName = ctx.full_table_name() ? ctx.full_table_name().accept(this) : [];
+      return {
+        value: [].concat(_toConsumableArray(fullTableName), [columnName]),
+        type: _constants.DATA_TYPE.EXPRESSION
+      };
+    }
+
     // primitive_constant
     //   : STRING // string, datetime or uniqueidentifier
     //   | BINARY
@@ -559,16 +593,41 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
       var _splitColumnDefTableC = splitColumnDefTableConstraints(columnDefTableConstraints),
         fieldsData = _splitColumnDefTableC.fieldsData,
         indexes = _splitColumnDefTableC.indexes,
-        tableRefs = _splitColumnDefTableC.tableRefs;
+        tableRefs = _splitColumnDefTableC.tableRefs,
+        tableCheckConstraints = _splitColumnDefTableC.checkConstraints;
       var _parseFieldsAndInline = parseFieldsAndInlineRefsFromFieldsData(fieldsData, tableName, schemaName),
         inlineRefs = _parseFieldsAndInline.inlineRefs,
-        fields = _parseFieldsAndInline.fields;
+        fields = _parseFieldsAndInline.fields,
+        columnCheckConstraints = _parseFieldsAndInline.checkConstraints;
       (_this$data$refs = this.data.refs).push.apply(_this$data$refs, _toConsumableArray((0, _lodash.flatten)(inlineRefs)));
       (_this$data$refs2 = this.data.refs).push.apply(_this$data$refs2, _toConsumableArray(tableRefs.map(function (tableRef) {
         tableRef.endpoints[0].tableName = tableName;
         tableRef.endpoints[0].schemaName = schemaName;
         return tableRef;
       })));
+
+      // these check constraints represent enums
+      var enums = [];
+      var checkConstraints = columnCheckConstraints.concat(tableCheckConstraints);
+      checkConstraints.forEach(function (checkConstraint) {
+        var field = fields.find(function (field) {
+          return field.name === checkConstraint.column;
+        });
+        if (!field) return;
+        var enumObject = new _AST.Enum({
+          name: "".concat(tableName, "_").concat(field.name, "_enum"),
+          values: checkConstraint.columnValues.map(function (value) {
+            return {
+              name: value
+            };
+          }),
+          schemaName: schemaName
+        });
+        _this8.data.enums.push(enumObject);
+        // TODO: handle multiple enums for the same field
+        field.type.type_name = enumObject.name;
+        field.type.schemaName = enumObject.schemaName;
+      });
       var table = new _AST.Table({
         name: tableName,
         schemaName: schemaName,
@@ -653,7 +712,8 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
         kind: _constants.TABLE_CONSTRAINT_KIND.FIELD,
         value: {
           field: field,
-          inline_refs: []
+          inline_refs: [],
+          checkConstraints: []
         }
       };
       var columnDefinitions = ctx.column_definition_element().map(function (columnDef) {
@@ -688,8 +748,16 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
             definition.value.inline_refs.push(columnDef.value);
             break;
           case _constants.COLUMN_CONSTRAINT_KIND.CHECK:
-            field.type.type_name = "".concat(field.type.type_name, " ").concat(columnDef.value);
-            break;
+            {
+              var _columnDef$value = columnDef.value,
+                _type = _columnDef$value.type,
+                value = _columnDef$value.value;
+
+              // we keep the current behavior: when a field has a check constraints cannot be converted to enum, we will ignore it
+              if (_type !== CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) return;
+              definition.value.checkConstraints.push(value);
+              break;
+            }
           default:
             break;
         }
@@ -813,7 +881,76 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitCheck_constraint",
     value: function visitCheck_constraint(ctx) {
-      return (0, _helpers.getOriginalText)(ctx);
+      return ctx.search_condition().accept(this);
+    }
+
+    // search_condition
+    //   : NOT* (predicate | '(' search_condition ')')
+    //   | search_condition AND search_condition // AND takes precedence over OR
+    //   | search_condition OR search_condition
+    //   ;
+  }, {
+    key: "visitSearch_condition",
+    value: function visitSearch_condition(ctx) {
+      // we will parse the enum from the most basic condition - map to the old behavior
+      // others, we will get the check constraint to ensure the constraint is applied - enhance the old behavior
+      if (!ctx.predicate() || ctx.NOT().length) {
+        return {
+          type: CHECK_CONSTRAINT_CONDITION_TYPE.RAW,
+          value: (0, _helpers.getOriginalText)(ctx)
+        };
+      }
+      var predicate = ctx.predicate().accept(this);
+      if (!predicate) {
+        return {
+          type: CHECK_CONSTRAINT_CONDITION_TYPE.RAW,
+          value: (0, _helpers.getOriginalText)(ctx)
+        };
+      }
+      return {
+        type: CHECK_CONSTRAINT_CONDITION_TYPE.ENUM,
+        value: predicate
+      };
+    }
+
+    // predicate
+    //   : EXISTS '(' subquery ')'
+    //   | freetext_predicate
+    //   | expression comparison_operator expression
+    //   | expression MULT_ASSIGN expression ////SQL-82 syntax for left outer joins; '*='. See https://stackoverflow.com/questions/40665/in-sybase-sql
+    //   | expression comparison_operator (ALL | SOME | ANY) '(' subquery ')'
+    //   | expression NOT* BETWEEN expression AND expression
+    //   | expression NOT* IN '(' (subquery | expression_list_) ')'
+    //   | expression NOT* LIKE expression (ESCAPE expression)?
+    //   | expression IS null_notnull
+    //   ;
+  }, {
+    key: "visitPredicate",
+    value: function visitPredicate(ctx) {
+      var _this12 = this;
+      if (ctx.IN() && ctx.expression_list_() && ctx.NOT().length === 0) {
+        var _expression$value;
+        var _ctx$expression$map = ctx.expression().map(function (e) {
+            return e.accept(_this12);
+          }),
+          _ctx$expression$map2 = _slicedToArray(_ctx$expression$map, 1),
+          _ctx$expression$map2$ = _ctx$expression$map2[0],
+          expression = _ctx$expression$map2$ === void 0 ? {} : _ctx$expression$map2$;
+
+        // {
+        //   value: [ 'myschema', 'sample_table', 'column_name' ],
+        //   type: 'expression'
+        // }
+        var column = (0, _lodash.last)((_expression$value = expression.value) !== null && _expression$value !== void 0 ? _expression$value : []);
+        var expressionList = ctx.expression_list_().accept(this).map(function (e) {
+          return e.value;
+        });
+        return {
+          column: column,
+          columnValues: expressionList
+        };
+      }
+      return null;
     }
   }, {
     key: "visitNull_notnull",
@@ -829,17 +966,17 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitForeign_key_options",
     value: function visitForeign_key_options(ctx) {
-      var _this12 = this;
+      var _this13 = this;
       var names = ctx.table_name().accept(this);
       var _getSchemaAndTableNam2 = getSchemaAndTableName(names),
         refSchemaName = _getSchemaAndTableNam2.schemaName,
         refTableName = _getSchemaAndTableNam2.tableName;
       var fieldNames = ctx.column_name_list().accept(this);
       var onDelete = ctx.on_delete() ? ctx.on_delete().map(function (action) {
-        return action.accept(_this12);
+        return action.accept(_this13);
       })[0] : null;
       var onUpdate = ctx.on_update() ? ctx.on_update().map(function (action) {
-        return action.accept(_this12);
+        return action.accept(_this13);
       })[0] : null;
       return {
         refTableName: refTableName,
@@ -856,9 +993,9 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitColumn_name_list",
     value: function visitColumn_name_list(ctx) {
-      var _this13 = this;
+      var _this14 = this;
       return ctx.id_().map(function (id) {
-        return id.accept(_this13);
+        return id.accept(_this14);
       });
     }
 
@@ -910,9 +1047,9 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitTable_constraint",
     value: function visitTable_constraint(ctx) {
-      var _this14 = this;
+      var _this15 = this;
       var name = ctx.id_() ? ctx.id_().map(function (id) {
-        return id.accept(_this14);
+        return id.accept(_this15);
       })[0] : '';
       if (ctx.PRIMARY() || ctx.UNIQUE()) {
         var columns = ctx.column_name_list_with_order().accept(this);
@@ -970,6 +1107,14 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
           }
         };
       }
+      if (ctx.check_constraint()) {
+        var checkConstraint = ctx.check_constraint().accept(this);
+        if (checkConstraint.type !== CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) return null;
+        return {
+          kind: _constants.TABLE_CONSTRAINT_KIND.CHECK,
+          value: checkConstraint.value
+        };
+      }
       return null;
     }
 
@@ -979,10 +1124,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitColumn_name_list_with_order",
     value: function visitColumn_name_list_with_order(ctx) {
-      var _this15 = this;
+      var _this16 = this;
       return ctx.id_().map(function (id) {
         return {
-          value: id.accept(_this15),
+          value: id.accept(_this16),
           type: 'column'
         };
       });
@@ -998,10 +1143,10 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitTable_indices",
     value: function visitTable_indices(ctx) {
-      var _this16 = this;
+      var _this17 = this;
       var index = new _AST.Index({
         name: ctx.id_().map(function (id) {
-          return id.accept(_this16);
+          return id.accept(_this17);
         })[0],
         unique: !!ctx.UNIQUE(),
         columns: ctx.column_name_list_with_order().accept(this)
@@ -1031,7 +1176,11 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitAlter_table",
     value: function visitAlter_table(ctx) {
-      var _this$data$refs3, _this$data$refs4, _table$fields, _table$indexes;
+      var _this$data$refs3,
+        _this$data$refs4,
+        _table$fields,
+        _table$indexes,
+        _this18 = this;
       // table_name() returns an array because there are multiple table_name in the clause (REFERENCES table_name ...)
       var names = ctx.table_name()[0].accept(this);
       var _getSchemaAndTableNam3 = getSchemaAndTableName(names),
@@ -1047,7 +1196,8 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
         fieldsData = _splitColumnDefTableC2.fieldsData,
         indexes = _splitColumnDefTableC2.indexes,
         tableRefs = _splitColumnDefTableC2.tableRefs,
-        columnDefaults = _splitColumnDefTableC2.columnDefaults;
+        columnDefaults = _splitColumnDefTableC2.columnDefaults,
+        checkConstraints = _splitColumnDefTableC2.checkConstraints;
       var _parseFieldsAndInline2 = parseFieldsAndInlineRefsFromFieldsData(fieldsData, tableName, schemaName),
         inlineRefs = _parseFieldsAndInline2.inlineRefs,
         fields = _parseFieldsAndInline2.fields;
@@ -1066,6 +1216,25 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
         if (!field) return;
         field.dbdefault = columnDefault.defaultValue;
       });
+      checkConstraints.forEach(function (checkConstraint) {
+        var field = table.fields.find(function (field) {
+          return field.name === checkConstraint.column;
+        });
+        if (!field) return;
+        var enumObject = new _AST.Enum({
+          name: "".concat(tableName, "_").concat(field.name, "_enum"),
+          values: checkConstraint.columnValues.map(function (value) {
+            return {
+              name: value
+            };
+          }),
+          schemaName: schemaName
+        });
+        _this18.data.enums.push(enumObject);
+        // TODO: handle multiple enums for the same field
+        field.type.type_name = enumObject.name;
+        field.type.schemaName = enumObject.schemaName;
+      });
     }
 
     // create_index
@@ -1208,12 +1377,12 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitFunc_proc_name_server_database_schema",
     value: function visitFunc_proc_name_server_database_schema(ctx) {
-      var _this17 = this;
+      var _this19 = this;
       if (ctx.func_proc_name_database_schema()) {
         return ctx.func_proc_name_database_schema().accept(this);
       } else {
         return ctx.id_().map(function (id) {
-          return id.accept(_this17);
+          return id.accept(_this19);
         });
       }
     }
@@ -1225,12 +1394,12 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitFunc_proc_name_database_schema",
     value: function visitFunc_proc_name_database_schema(ctx) {
-      var _this18 = this;
+      var _this20 = this;
       if (ctx.func_proc_name_schema()) {
         return ctx.func_proc_name_schema().accept(this);
       } else {
         return ctx.id_().map(function (id) {
-          return id.accept(_this18);
+          return id.accept(_this20);
         });
       }
     }
@@ -1241,9 +1410,9 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitFunc_proc_name_schema",
     value: function visitFunc_proc_name_schema(ctx) {
-      var _this19 = this;
+      var _this21 = this;
       return ctx.id_().map(function (id) {
-        return id.accept(_this19);
+        return id.accept(_this21);
       });
     }
 
@@ -1254,14 +1423,14 @@ var MssqlASTGen = /*#__PURE__*/function (_TSqlParserVisitor) {
   }, {
     key: "visitExecute_statement_arg",
     value: function visitExecute_statement_arg(ctx) {
-      var _this20 = this;
+      var _this22 = this;
       if (ctx.execute_statement_arg_unnamed()) {
         return ctx.execute_statement_arg_unnamed().map(function (item) {
-          return item.accept(_this20);
+          return item.accept(_this22);
         });
       }
       return ctx.execute_statement_arg_named().map(function (item) {
-        return item.accept(_this20);
+        return item.accept(_this22);
       });
     }
 

package/lib/parse/ANTLR/ASTGeneration/mysql/MySQLASTGen.js

@@ -9,7 +9,6 @@ var _lodash = require("lodash");
 var _MySqlParserVisitor = _interopRequireDefault(require("../../parsers/mysql/MySqlParserVisitor"));
 var _AST = require("../AST");
 var _constants = require("../constants");
-var _utils = require("../../../../model_structure/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -1178,17 +1177,16 @@ var MySQLASTGen = /*#__PURE__*/function (_MySQLParserVisitor) {
       var names = ctx.tableName().accept(this);
       var tableName = (0, _lodash.last)(names);
       var schemaName = names.length > 1 ? names[names.length - 2] : undefined;
-      var fullTableName = (0, _utils.getFullTableName)(schemaName, tableName);
 
       // insert without specified columns
       var columns = ctx.fullColumnNameList() ? ctx.fullColumnNameList().accept(this) : [];
       var values = ctx.insertStatementValue().accept(this);
-      var record = {
+      var record = new _AST.TableRecord({
         schemaName: schemaName,
         tableName: tableName,
         columns: columns,
         values: values
-      };
+      });
       this.data.records.push(record);
     }
 

package/lib/parse/ANTLR/ASTGeneration/postgres/PostgresASTGen.js

@@ -9,7 +9,6 @@ var _lodash = require("lodash");
 var _PostgreSQLParserVisitor = _interopRequireDefault(require("../../parsers/postgresql/PostgreSQLParserVisitor"));
 var _AST = require("../AST");
 var _constants = require("../constants");
-var _utils = require("../../../../model_structure/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -1177,16 +1176,15 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       var names = ctx.insert_target().accept(this);
       var tableName = (0, _lodash.last)(names);
       var schemaName = names.length > 1 ? names[names.length - 2] : undefined;
-      var fullTableName = (0, _utils.getFullTableName)(schemaName, tableName);
       var _ctx$insert_rest$acce = ctx.insert_rest().accept(this),
         columns = _ctx$insert_rest$acce.columns,
         values = _ctx$insert_rest$acce.values;
-      var record = {
+      var record = new _AST.TableRecord({
         schemaName: schemaName,
         tableName: tableName,
         columns: columns,
         values: values
-      };
+      });
       this.data.records.push(record);
     }
   }, {

package/lib/parse/Parser.js

@@ -55,12 +55,10 @@ var Parser = /*#__PURE__*/function () {
           case 'schemarb':
             rawDatabase = Parser.parseSchemaRbToJSON(str);
             break;
-          case 'mssql':
+          case 'mssqlLegacy':
             rawDatabase = Parser.parseMSSQLToJSON(str);
             break;
-
-          // When we finish implementing the new parser, it should be mssql and the old one will be mssqlLegacy
-          case 'mssqlv2':
+          case 'mssql':
             rawDatabase = Parser.parseMSSQLToJSONv2(str);
             break;
           case 'json':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.12.0-alpha-0",
+  "version": "3.12.0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.12.0-alpha-0",
+    "@dbml/parse": "^3.12.0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,7 +59,7 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "da2bec56f10f32db65a06856105f08b522556661",
+  "gitHead": "e14cab048ba2c38acb622e780bea160a115a03d5",
   "engines": {
     "node": ">=16"
   }

package/types/import/index.d.ts

@@ -1,4 +1,4 @@
-declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy'): string;
+declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy' | 'mssqlLegacy'): string;
 
 /**
  * @param {any} schemaJson

package/types/model_structure/database.d.ts

@@ -17,7 +17,7 @@ export interface Project {
     name: string;
 }
 
-interface RawRecord {
+interface RawTableRecord {
     schemaName: string | undefined;
     tableName: string;
     columns: string[];
@@ -27,12 +27,12 @@ interface RawRecord {
     }[][];
 }
 
-export interface Record extends RawRecord {
+export interface TableRecord extends RawTableRecord {
     id: number;
 }
 
-export interface NormalizedRecord {
-    [_id: number]: Record;
+export interface NormalizedRecords {
+    [_id: number]: TableRecord;
 }
 
 export interface RawDatabase {
@@ -43,7 +43,7 @@ export interface RawDatabase {
     refs: Ref[];
     tableGroups: TableGroup[];
     project: Project;
-    records: RawRecord[];
+    records: RawTableRecord[];
 }
 declare class Database extends Element {
     dbState: DbState;
@@ -54,11 +54,11 @@ declare class Database extends Element {
     noteToken: Token;
     databaseType: string;
     name: string;
-    records: Record[];
+    records: TableRecord[];
     id: number;
     constructor({ schemas, tables, enums, refs, tableGroups, project, records }: RawDatabase);
     generateId(): void;
-    processRecords(rawRecords: RawRecord[]): void;
+    processRecords(rawRecords: RawTableRecord[]): void;
     processSchemas(rawSchemas: RawSchema[]): void;
     pushSchema(schema: Schema): void;
     checkSchema(schema: Schema): void;
@@ -242,6 +242,6 @@ export interface NormalizedDatabase {
     indexes: NormalizedIndex;
     indexColumns: NormalizedIndexColumn;
     fields: NormalizedField;
-    records: NormalizedRecord;
+    records: NormalizedRecords;
 }
 export default Database;

package/types/parse/Parser.d.ts

@@ -5,7 +5,7 @@ declare type ParseFormat = 'json'
     | 'mysql' | 'mysqlLegacy'
     | 'postgres' | 'postgresLegacy'
     | 'dbml' | 'dbmlv2'
-    | 'mssql' | 'mssqlv2'
+    | 'mssql' | 'mssqlLegacy'
     | 'schemarb'
     | 'snowflake';