@dbml/core 3.14.0 → 3.15.0-alpha.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,9 @@ 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 _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; }
@@ -113,17 +116,17 @@ var parseFieldsAndInlineRefsFromFieldsData = function parseFieldsAndInlineRefsFr
       });
       acc[0].push(inlineRefs);
       acc[1].push(fieldData.field);
-      (_acc$ = acc[2]).push.apply(_acc$, _toConsumableArray(fieldData.checkConstraints));
+      (_acc$ = acc[2]).push.apply(_acc$, _toConsumableArray(fieldData.enumCheckConstraints));
       return acc;
     }, [[], [], []]),
     _fieldsData$reduce2 = _slicedToArray(_fieldsData$reduce, 3),
     resInlineRefs = _fieldsData$reduce2[0],
     fields = _fieldsData$reduce2[1],
-    checkConstraints = _fieldsData$reduce2[2];
+    enumCheckConstraints = _fieldsData$reduce2[2];
   return {
     inlineRefs: resInlineRefs,
     fields: fields,
-    checkConstraints: checkConstraints
+    enumCheckConstraints: enumCheckConstraints
   };
 };
 var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor) {
@@ -603,17 +606,26 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
       var _parseFieldsAndInline = parseFieldsAndInlineRefsFromFieldsData(fieldsData, tableName, schemaName),
         inlineRefs = _parseFieldsAndInline.inlineRefs,
         fields = _parseFieldsAndInline.fields,
-        columnCheckConstraints = _parseFieldsAndInline.checkConstraints;
+        columnEnumCheckConstraints = _parseFieldsAndInline.enumCheckConstraints;
       (_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 allCheckConstraints = columnEnumCheckConstraints.concat(tableCheckConstraints);
+      var rawTableConstraints = [];
+      allCheckConstraints.forEach(function (checkConstraint) {
+        if (checkConstraint.isRaw) {
+          var constraintObj = {
+            expression: checkConstraint.expression
+          };
+          if (checkConstraint.name) {
+            constraintObj.name = checkConstraint.name;
+          }
+          rawTableConstraints.push(constraintObj);
+          return;
+        }
         var field = fields.find(function (fieldItem) {
           return fieldItem.name === checkConstraint.column;
         });
@@ -628,7 +640,7 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
           schemaName: schemaName
         });
         _this8.data.enums.push(enumObject);
-        // TODO: handle multiple enums for the same field
+        // TODO: Handle multiple enums for the same field
         field.type.type_name = enumObject.name;
         field.type.schemaName = enumObject.schemaName;
       });
@@ -636,7 +648,8 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         name: tableName,
         schemaName: schemaName,
         fields: fields,
-        indexes: tableIndices.concat(indexes)
+        indexes: tableIndices.concat(indexes),
+        constraints: rawTableConstraints
       });
       this.data.tables.push(table);
     }
@@ -717,7 +730,7 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         value: {
           field: field,
           inline_refs: [],
-          checkConstraints: []
+          enumCheckConstraints: []
         }
       };
       var columnDefinitions = ctx.column_definition_element().map(function (columnDef) {
@@ -755,11 +768,24 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
             {
               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);
+                value = _columnDef$value.value,
+                name = _columnDef$value.name;
+              if (columnDefType === CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) {
+                // If it's an ENUM type (simple IN clause without NOT), queue it for enum extraction
+                definition.value.enumCheckConstraints.push(value);
+              } else if (columnDefType === CHECK_CONSTRAINT_CONDITION_TYPE.RAW) {
+                // For RAW constraints (complex expressions), add directly to field.constraints array
+                if (!field.constraints) {
+                  field.constraints = [];
+                }
+                var constraintObj = {
+                  expression: value
+                };
+                if (name) {
+                  constraintObj.name = name;
+                }
+                field.constraints.push(constraintObj);
+              }
               break;
             }
           default:
@@ -871,9 +897,13 @@ 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;
@@ -1113,10 +1143,23 @@ 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;
+
+        // If it's an ENUM type (simple IN clause), return for enum extraction
+        if (checkConstraint.type === CHECK_CONSTRAINT_CONDITION_TYPE.ENUM) {
+          return {
+            kind: _constants.TABLE_CONSTRAINT_KIND.CHECK,
+            value: checkConstraint.value
+          };
+        }
+
+        // For RAW constraints, return them too so they can be added to table.constraints
         return {
           kind: _constants.TABLE_CONSTRAINT_KIND.CHECK,
-          value: checkConstraint.value
+          value: {
+            expression: checkConstraint.value,
+            name: name,
+            isRaw: true // Mark as raw constraint
+          }
         };
       }
       return null;
@@ -1221,6 +1264,20 @@ var MssqlASTGen = exports["default"] = /*#__PURE__*/function (_TSqlParserVisitor
         field.dbdefault = columnDefault.defaultValue;
       });
       checkConstraints.forEach(function (checkConstraint) {
+        // Handle RAW table-level constraints (complex expressions that won't become enums)
+        if (checkConstraint.isRaw) {
+          var constraintObj = {
+            expression: checkConstraint.expression
+          };
+          if (checkConstraint.name) {
+            constraintObj.name = checkConstraint.name;
+          }
+          table.constraints.push(constraintObj);
+          return;
+        }
+
+        // Handle ENUM constraints: simple IN clauses like CHECK (status IN ('a', 'b', 'c'))
+        // These get converted to actual Enum objects and the field type is updated
         var field = table.fields.find(function (fieldItem) {
           return fieldItem.name === checkConstraint.column;
         });