@dbml/core 3.14.1 → 4.0.0

package/lib/model_structure/table.js

@@ -11,6 +11,7 @@ var _field = _interopRequireDefault(require("./field"));
 var _indexes = _interopRequireDefault(require("./indexes"));
 var _config = require("./config");
 var _utils = require("./utils");
+var _constraint = _interopRequireDefault(require("./constraint"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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."); }
@@ -44,6 +45,8 @@ var Table = /*#__PURE__*/function (_Element) {
       fields = _ref$fields === void 0 ? [] : _ref$fields,
       _ref$indexes = _ref.indexes,
       indexes = _ref$indexes === void 0 ? [] : _ref$indexes,
+      _ref$constraints = _ref.constraints,
+      constraints = _ref$constraints === void 0 ? [] : _ref$constraints,
       _ref$schema = _ref.schema,
       schema = _ref$schema === void 0 ? {} : _ref$schema,
       token = _ref.token,
@@ -61,6 +64,7 @@ var Table = /*#__PURE__*/function (_Element) {
     _this.headerColor = headerColor;
     _this.fields = [];
     _this.indexes = [];
+    _this.constraints = [];
     _this.schema = schema;
     _this.partials = partials;
     _this.dbState = _this.schema.dbState;
@@ -71,6 +75,7 @@ var Table = /*#__PURE__*/function (_Element) {
     _this.processPartials();
     _this.checkFieldCount();
     _this.processIndexes(indexes);
+    _this.processConstraints(constraints);
     return _this;
   }
   _inherits(Table, _Element);
@@ -137,6 +142,21 @@ var Table = /*#__PURE__*/function (_Element) {
         }
       });
     }
+  }, {
+    key: "processConstraints",
+    value: function processConstraints(constraints) {
+      var _this5 = this;
+      constraints.forEach(function (constraint) {
+        _this5.pushConstraint(new _constraint["default"](_objectSpread(_objectSpread({}, constraint), {}, {
+          table: _this5
+        })));
+      });
+    }
+  }, {
+    key: "pushConstraint",
+    value: function pushConstraint(constraint) {
+      this.constraints.push(constraint);
+    }
   }, {
     key: "findField",
     value: function findField(fieldName) {
@@ -153,7 +173,7 @@ var Table = /*#__PURE__*/function (_Element) {
     key: "processPartials",
     value: function processPartials() {
       var _this$partials,
-        _this5 = this;
+        _this6 = this;
       if (!((_this$partials = this.partials) !== null && _this$partials !== void 0 && _this$partials.length)) return;
       /**
        * When encountering conflicting columns or settings with identical names, the following resolution order is applied:
@@ -182,14 +202,14 @@ var Table = /*#__PURE__*/function (_Element) {
 
       // insert placeholder into table.fields
       sortedPartials.toReversed().forEach(function (partial) {
-        _this5.fields.splice(partial.order, 0, 'dummy');
+        _this6.fields.splice(partial.order, 0, 'dummy');
       });
       sortedPartials.forEach(function (partial) {
-        var tablePartial = _this5.schema.database.findTablePartial(partial.name);
-        if (!tablePartial) _this5.error("Table partial ".concat(partial.name, " not found"), partial.token);
+        var tablePartial = _this6.schema.database.findTablePartial(partial.name);
+        if (!tablePartial) _this6.error("Table partial ".concat(partial.name, " not found"), partial.token);
         partial.id = tablePartial.id;
         if (tablePartial.fields) {
-          var _this5$fields;
+          var _this6$fields;
           // ignore fields that already exist in the table, or have been added by a later partial
           var rawFields = tablePartial.fields.filter(function (f) {
             return !existingFieldNames.has(f.name);
@@ -200,12 +220,12 @@ var Table = /*#__PURE__*/function (_Element) {
             // convert inline_refs from injected fields to refs
             if (rawField.inline_refs) {
               rawField.inline_refs.forEach(function (iref) {
-                var _this5$schema;
+                var _this6$schema;
                 var ref = {
                   token: rawField.token,
                   endpoints: [{
-                    tableName: _this5.name,
-                    schemaName: (_this5$schema = _this5.schema) === null || _this5$schema === void 0 ? void 0 : _this5$schema.name,
+                    tableName: _this6.name,
+                    schemaName: (_this6$schema = _this6.schema) === null || _this6$schema === void 0 ? void 0 : _this6$schema.name,
                     fieldNames: [rawField.name],
                     relation: ['-', '<'].includes(iref.relation) ? '1' : '*',
                     token: rawField.token
@@ -219,36 +239,44 @@ var Table = /*#__PURE__*/function (_Element) {
                   injectedPartial: tablePartial
                 };
                 // The global array containing references with 1 endpoint being a field injected from a partial to a table
-                _this5.schema.database.injectedRawRefs.push(ref);
+                _this6.schema.database.injectedRawRefs.push(ref);
               });
             }
             return new _field["default"](_objectSpread(_objectSpread({}, rawField), {}, {
               noteToken: null,
-              table: _this5,
+              table: _this6,
               injectedPartial: tablePartial,
               injectedToken: partial.token
             }));
           });
-          (_this5$fields = _this5.fields).splice.apply(_this5$fields, [partial.order, 1].concat(_toConsumableArray(fields)));
+          (_this6$fields = _this6.fields).splice.apply(_this6$fields, [partial.order, 1].concat(_toConsumableArray(fields)));
         } else {
-          _this5.fields.splice(partial.order, 1); // still need to remove the dummy element, even when there's no field in the partial
+          _this6.fields.splice(partial.order, 1); // still need to remove the dummy element, even when there's no field in the partial
         }
 
         // merge settings
         if (!existingSettingNames.has('note') && !(0, _lodash.isNil)(tablePartial.note)) {
-          _this5.noteToken = null;
-          _this5.note = tablePartial.note;
+          _this6.noteToken = null;
+          _this6.note = tablePartial.note;
           existingSettingNames.add('note');
         }
         if (!existingSettingNames.has('headerColor') && !(0, _lodash.isNil)(tablePartial.headerColor)) {
-          _this5.headerColor = tablePartial.headerColor;
+          _this6.headerColor = tablePartial.headerColor;
           existingSettingNames.add('headerColor');
         }
 
         // merge indexes
         tablePartial.indexes.forEach(function (index) {
-          _this5.indexes.push(new _indexes["default"](_objectSpread(_objectSpread({}, index), {}, {
-            table: _this5,
+          _this6.indexes.push(new _indexes["default"](_objectSpread(_objectSpread({}, index), {}, {
+            table: _this6,
+            injectedPartial: tablePartial
+          })));
+        });
+        tablePartial.constraints.forEach(function (constraint) {
+          _this6.constraints.push(new _constraint["default"](_objectSpread(_objectSpread({}, constraint), {}, {
+            name: constraint.name && "".concat(_this6.name, ".").concat(constraint.name),
+            // deduplicate constraint names when instantiated to tables
+            table: _this6,
             injectedPartial: tablePartial
           })));
         });
@@ -280,6 +308,9 @@ var Table = /*#__PURE__*/function (_Element) {
         }),
         indexIds: this.indexes.map(function (i) {
           return i.id;
+        }),
+        constraintIds: this.constraints.map(function (c) {
+          return c.id;
         })
       };
     }
@@ -314,6 +345,9 @@ var Table = /*#__PURE__*/function (_Element) {
       this.indexes.forEach(function (index) {
         return index.normalize(model);
       });
+      this.constraints.forEach(function (constraint) {
+        return constraint.normalize(model);
+      });
     }
   }]);
 }(_element["default"]);

package/lib/model_structure/tablePartial.js

@@ -33,6 +33,8 @@ var TablePartial = /*#__PURE__*/function (_Element) {
       fields = _ref$fields === void 0 ? [] : _ref$fields,
       _ref$indexes = _ref.indexes,
       indexes = _ref$indexes === void 0 ? [] : _ref$indexes,
+      _ref$constraints = _ref.constraints,
+      constraints = _ref$constraints === void 0 ? [] : _ref$constraints,
       token = _ref.token,
       headerColor = _ref.headerColor,
       _ref$noteToken = _ref.noteToken,
@@ -46,6 +48,7 @@ var TablePartial = /*#__PURE__*/function (_Element) {
     _this.headerColor = headerColor;
     _this.fields = fields;
     _this.indexes = indexes;
+    _this.constraints = constraints;
     _this.dbState = dbState;
     _this.generateId();
     return _this;

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

@@ -70,7 +70,8 @@ var Field = exports.Field = /*#__PURE__*/function () {
    *  dbdefault: {value: string, type: 'string' | 'number' | 'boolean' | 'expression'},
    *  unique: boolean,
    *  pk: boolean,
-   *  note: {value: string}
+   *  note: {value: string},
+   *  constraints: {expression: string, name?: string}[]
    * }} param0
    */
   function Field(_ref2) {
@@ -81,7 +82,8 @@ var Field = exports.Field = /*#__PURE__*/function () {
       dbdefault = _ref2.dbdefault,
       unique = _ref2.unique,
       pk = _ref2.pk,
-      note = _ref2.note;
+      note = _ref2.note,
+      constraints = _ref2.constraints;
     _classCallCheck(this, Field);
     /** @type {string} */
     this.name = name;
@@ -106,6 +108,9 @@ var Field = exports.Field = /*#__PURE__*/function () {
 
     /** @type {{value: string}} */
     this.note = note;
+
+    /** @type {{expression: string, name?: string}[]} */
+    this.constraints = constraints;
   }
   return _createClass(Field, [{
     key: "toJSON",
@@ -118,7 +123,8 @@ var Field = exports.Field = /*#__PURE__*/function () {
         dbdefault: this.dbdefault,
         unique: this.unique,
         pk: this.pk,
-        note: this.note
+        note: this.note,
+        constraints: this.constraints
       };
     }
   }]);
@@ -130,7 +136,8 @@ var Table = exports.Table = /*#__PURE__*/function () {
    *  schemaName: string,
    *  fields: Field[],
    *  indexes: Index[],
-   *  note: {value: string}
+   *  note: {value: string},
+   *  constraints: {expression: string, name?: string}[]
    * }} param0
    */
   function Table(_ref3) {
@@ -138,7 +145,8 @@ var Table = exports.Table = /*#__PURE__*/function () {
       schemaName = _ref3.schemaName,
       fields = _ref3.fields,
       indexes = _ref3.indexes,
-      note = _ref3.note;
+      note = _ref3.note,
+      constraints = _ref3.constraints;
     _classCallCheck(this, Table);
     /** @type {string} */
     this.name = name;
@@ -154,6 +162,9 @@ var Table = exports.Table = /*#__PURE__*/function () {
 
     /** @type {{value: string}} */
     this.note = note;
+
+    /** @type {{expression: string, name?: string}[]} */
+    this.constraints = constraints || [];
   }
   return _createClass(Table, [{
     key: "toJSON",
@@ -168,7 +179,8 @@ var Table = exports.Table = /*#__PURE__*/function () {
         indexes: (_this$indexes = this.indexes) === null || _this$indexes === void 0 ? void 0 : _this$indexes.map(function (i) {
           return i.toJSON();
         }),
-        note: this.note
+        note: this.note,
+        constraints: this.constraints
       };
     }
   }]);

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

@@ -10,7 +10,8 @@ var TABLE_CONSTRAINT_KIND = exports.TABLE_CONSTRAINT_KIND = {
   FK: 'fk',
   UNIQUE: 'unique',
   PK: 'pk',
-  DEFAULT: 'default'
+  DEFAULT: 'default',
+  CHECK: 'check'
 };
 var COLUMN_CONSTRAINT_KIND = exports.COLUMN_CONSTRAINT_KIND = {
   NOT_NULL: 'not_null',

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

@@ -11,6 +11,13 @@ var _constants = require("../constants");
 var _helpers = require("../helpers");
 var _AST = require("../AST");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -23,10 +30,6 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -34,10 +37,6 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; } /* 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;
@@ -104,7 +103,6 @@ var splitColumnDefTableConstraints = function splitColumnDefTableConstraints(col
 };
 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;
@@ -113,17 +111,14 @@ 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, 3),
+    _fieldsData$reduce2 = _slicedToArray(_fieldsData$reduce, 2),
     resInlineRefs = _fieldsData$reduce2[0],
-    fields = _fieldsData$reduce2[1],
-    checkConstraints = _fieldsData$reduce2[2];
+    fields = _fieldsData$reduce2[1];
   return {
     inlineRefs: resInlineRefs,
-    fields: fields,
-    checkConstraints: checkConstraints
+    fields: fields
   };
 };
 var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor) {
@@ -602,41 +597,19 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         tableCheckConstraints = _splitColumnDefTableC.checkConstraints;
       var _parseFieldsAndInline = parseFieldsAndInlineRefsFromFieldsData(fieldsData, tableName, schemaName),
         inlineRefs = _parseFieldsAndInline.inlineRefs,
-        fields = _parseFieldsAndInline.fields,
-        columnCheckConstraints = _parseFieldsAndInline.checkConstraints;
+        fields = _parseFieldsAndInline.fields;
       (_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 checkConstraints = columnCheckConstraints.concat(tableCheckConstraints);
-      checkConstraints.forEach(function (checkConstraint) {
-        var field = fields.find(function (fieldItem) {
-          return fieldItem.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,
         fields: fields,
-        indexes: tableIndices.concat(indexes)
+        indexes: tableIndices.concat(indexes),
+        constraints: tableCheckConstraints
       });
       this.data.tables.push(table);
     }
@@ -716,8 +689,7 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         kind: _constants.TABLE_CONSTRAINT_KIND.FIELD,
         value: {
           field: field,
-          inline_refs: [],
-          checkConstraints: []
+          inline_refs: []
         }
       };
       var columnDefinitions = ctx.column_definition_element().map(function (columnDef) {
@@ -754,12 +726,18 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
           case _constants.COLUMN_CONSTRAINT_KIND.CHECK:
             {
               var _columnDef$value = columnDef.value,
-                columnDefType = _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 (columnDefType !== CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) return;
-              definition.value.checkConstraints.push(value);
+                _expression = _columnDef$value.expression,
+                name = _columnDef$value.name;
+              if (!field.constraints) {
+                field.constraints = [];
+              }
+              var constraintObj = {
+                expression: _expression
+              };
+              if (name) {
+                constraintObj.name = name;
+              }
+              field.constraints.push(constraintObj);
               break;
             }
           default:
@@ -868,12 +846,14 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
           }
         };
       }
-
-      // we do not handle check constraint since it is complicated and hard to extract enum from it
       if (ctx.check_constraint()) {
+        var constraintName = ctx.id_() ? ctx.id_().accept(this) : null;
+        var checkConstraintResult = ctx.check_constraint().accept(this);
         return {
           kind: _constants.COLUMN_CONSTRAINT_KIND.CHECK,
-          value: ctx.check_constraint().accept(this)
+          value: _objectSpread(_objectSpread({}, checkConstraintResult), {}, {
+            name: constraintName
+          })
         };
       }
       return null;
@@ -896,24 +876,8 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     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
+        expression: (0, _helpers.getOriginalText)(ctx)
       };
     }
 
@@ -1113,10 +1077,12 @@ var MssqlASTGen = exports["default"] = /*#__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
+          value: {
+            expression: checkConstraint.expression,
+            name: name
+          }
         };
       }
       return null;
@@ -1180,11 +1146,7 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitAlter_table",
     value: function visitAlter_table(ctx) {
-      var _this$data$refs3,
-        _this$data$refs4,
-        _table$fields,
-        _table$indexes,
-        _this16 = this;
+      var _this$data$refs3, _this$data$refs4, _table$fields, _table$indexes;
       // 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),
@@ -1221,23 +1183,13 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         field.dbdefault = columnDefault.defaultValue;
       });
       checkConstraints.forEach(function (checkConstraint) {
-        var field = table.fields.find(function (fieldItem) {
-          return fieldItem.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
-        });
-        _this16.data.enums.push(enumObject);
-        // TODO: handle multiple enums for the same field
-        field.type.type_name = enumObject.name;
-        field.type.schemaName = enumObject.schemaName;
+        var constraintObj = {
+          expression: checkConstraint.expression
+        };
+        if (checkConstraint.name) {
+          constraintObj.name = checkConstraint.name;
+        }
+        table.constraints.push(constraintObj);
       });
     }
 
@@ -1381,12 +1333,12 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitFunc_proc_name_server_database_schema",
     value: function visitFunc_proc_name_server_database_schema(ctx) {
-      var _this17 = this;
+      var _this16 = this;
       if (ctx.func_proc_name_database_schema()) {
         return ctx.func_proc_name_database_schema().accept(this);
       }
       return ctx.id_().map(function (id) {
-        return id.accept(_this17);
+        return id.accept(_this16);
       });
     }
 
@@ -1397,12 +1349,12 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitFunc_proc_name_database_schema",
     value: function visitFunc_proc_name_database_schema(ctx) {
-      var _this18 = this;
+      var _this17 = this;
       if (ctx.func_proc_name_schema()) {
         return ctx.func_proc_name_schema().accept(this);
       }
       return ctx.id_().map(function (id) {
-        return id.accept(_this18);
+        return id.accept(_this17);
       });
     }
 
@@ -1412,9 +1364,9 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitFunc_proc_name_schema",
     value: function visitFunc_proc_name_schema(ctx) {
-      var _this19 = this;
+      var _this18 = this;
       return ctx.id_().map(function (id) {
-        return id.accept(_this19);
+        return id.accept(_this18);
       });
     }
 
@@ -1425,14 +1377,14 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
   }, {
     key: "visitExecute_statement_arg",
     value: function visitExecute_statement_arg(ctx) {
-      var _this20 = this;
+      var _this19 = this;
       if (ctx.execute_statement_arg_unnamed()) {
         return ctx.execute_statement_arg_unnamed().map(function (item) {
-          return item.accept(_this20);
+          return item.accept(_this19);
         });
       }
       return ctx.execute_statement_arg_named().map(function (item) {
-        return item.accept(_this20);
+        return item.accept(_this19);
       });
     }