@nocobase/database 0.7.4-alpha.4 → 0.7.5-alpha.1

package/lib/relation-repository/multiple-relation-repository.js

@@ -31,6 +31,8 @@ var _updateGuard = require("../update-guard");
 
 var _relationRepository = require("./relation-repository");
 
+var _utils = require("../utils");
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 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); }
@@ -80,15 +82,36 @@ class MultipleRelationRepository extends _relationRepository.RelationRepository
           attributes: [_this.targetKey()],
           group: `${_this.targetModel.name}.${_this.targetKey()}`,
           transaction
-        }))).map(row => row.get(_this.targetKey()));
-        return yield sourceModel[getAccessor](_objectSpread(_objectSpread({}, (0, _lodash().omit)(findOptions, ['limit', 'offset'])), {}, {
-          where: {
-            [_this.targetKey()]: {
-              [_sequelize().Op.in]: ids
-            }
-          },
-          transaction
-        }));
+        }))).map(row => {
+          return {
+            row,
+            pk: row.get(_this.targetKey())
+          };
+        });
+
+        if (ids.length == 0) {
+          return [];
+        }
+
+        return yield (0, _utils.handleAppendsQuery)({
+          templateModel: ids[0].row,
+          queryPromises: findOptions.include.map(include => {
+            return sourceModel[getAccessor](_objectSpread(_objectSpread({}, (0, _lodash().omit)(findOptions, ['limit', 'offset'])), {}, {
+              include: [include],
+              where: {
+                [_this.targetKey()]: {
+                  [_sequelize().Op.in]: ids.map(id => id.pk)
+                }
+              },
+              transaction
+            })).then(rows => {
+              return {
+                rows,
+                include
+              };
+            });
+          })
+        });
       }
 
       return yield sourceModel[getAccessor](_objectSpread(_objectSpread({}, findOptions), {}, {

package/lib/relation-repository/relation-repository.js

@@ -19,7 +19,7 @@ var _filterParser = _interopRequireDefault(require("../filter-parser"));
 
 var _optionsParser = require("../options-parser");
 
-var _transactionDecorator = require("../transaction-decorator");
+var _transactionDecorator = require("../decorators/transaction-decorator");
 
 var _updateAssociations = require("../update-associations");
 
@@ -87,6 +87,12 @@ class RelationRepository {
     var _this = this;
 
     return _asyncToGenerator(function* () {
+      if (Array.isArray(options.values)) {
+        return Promise.all(options.values.map(record => _this.create(_objectSpread(_objectSpread({}, options), {}, {
+          values: record
+        }))));
+      }
+
       const createAccessor = _this.accessors().create;
 
       const guard = _updateGuard.UpdateGuard.fromOptions(_this.targetModel, options);

package/lib/relation-repository/single-relation-repository.js

@@ -19,6 +19,8 @@ var _updateAssociations = require("../update-associations");
 
 var _relationRepository = require("./relation-repository");
 
+var _utils = require("../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; }
@@ -69,6 +71,8 @@ class SingleRelationRepository extends _relationRepository.RelationRepository {
     var _this3 = this;
 
     return _asyncToGenerator(function* () {
+      var _findOptions$include;
+
       const transaction = yield _this3.getTransaction(options);
 
       const findOptions = _this3.buildQueryOptions(_objectSpread({}, options));
@@ -76,6 +80,30 @@ class SingleRelationRepository extends _relationRepository.RelationRepository {
       const getAccessor = _this3.accessors().get;
 
       const sourceModel = yield _this3.getSourceModel(transaction);
+
+      if ((findOptions === null || findOptions === void 0 ? void 0 : (_findOptions$include = findOptions.include) === null || _findOptions$include === void 0 ? void 0 : _findOptions$include.length) > 0) {
+        const templateModel = yield sourceModel[getAccessor](_objectSpread(_objectSpread({}, findOptions), {}, {
+          includeIgnoreAttributes: false,
+          transaction,
+          attributes: [_this3.targetKey()],
+          group: `${_this3.targetModel.name}.${_this3.targetKey()}`
+        }));
+        const results = yield (0, _utils.handleAppendsQuery)({
+          templateModel,
+          queryPromises: findOptions.include.map(include => {
+            return sourceModel[getAccessor](_objectSpread(_objectSpread({}, findOptions), {}, {
+              include: [include]
+            })).then(row => {
+              return {
+                rows: [row],
+                include
+              };
+            });
+          })
+        });
+        return results[0];
+      }
+
       return yield sourceModel[getAccessor](_objectSpread(_objectSpread({}, findOptions), {}, {
         transaction
       }));

package/lib/repository.d.ts

@@ -60,7 +60,7 @@ interface FindAndCountOptions extends Omit<SequelizeAndCountOptions, 'where' | '
     sort?: Sort;
 }
 export interface CreateOptions extends SequelizeCreateOptions {
-    values?: Values;
+    values?: Values | Values[];
     whitelist?: WhiteList;
     blacklist?: BlackList;
     updateAssociationValues?: AssociationKeysToBeUpdate;
@@ -130,7 +130,7 @@ export declare class Repository<TModelAttributes extends {} = any, TCreationAttr
      * @param values
      * @param options
      */
-    create<M extends Model>(options: CreateOptions): Promise<M>;
+    create(options: CreateOptions): Promise<any>;
     /**
      * Save Many instances to database
      *
@@ -144,7 +144,9 @@ export declare class Repository<TModelAttributes extends {} = any, TCreationAttr
      * @param values
      * @param options
      */
-    update(options: UpdateOptions): Promise<Model<any, any>[]>;
+    update(options: UpdateOptions & {
+        forceUpdate?: boolean;
+    }): Promise<Model<any, any>[]>;
     destroy(options?: TargetKey | TargetKey[] | DestroyOptions): any;
     /**
      * @param association target association

package/lib/repository.js

@@ -25,6 +25,10 @@ function _sequelize() {
   return data;
 }
 
+var _mustHaveFilterDecorator = _interopRequireDefault(require("./decorators/must-have-filter-decorator"));
+
+var _transactionDecorator = require("./decorators/transaction-decorator");
+
 var _filterParser = _interopRequireDefault(require("./filter-parser"));
 
 var _optionsParser = require("./options-parser");
@@ -37,12 +41,12 @@ var _hasmanyRepository = require("./relation-repository/hasmany-repository");
 
 var _hasoneRepository = require("./relation-repository/hasone-repository");
 
-var _transactionDecorator = require("./transaction-decorator");
-
 var _updateAssociations = require("./update-associations");
 
 var _updateGuard = require("./update-guard");
 
+var _utils = require("./utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -163,16 +167,37 @@ class Repository {
           attributes: [primaryKeyField],
           group: `${model.name}.${primaryKeyField}`,
           transaction
-        }))).map(row => row.get(primaryKeyField));
+        }))).map(row => {
+          return {
+            row,
+            pk: row.get(primaryKeyField)
+          };
+        });
+
+        if (ids.length == 0) {
+          return [];
+        }
+
         const where = {
           [primaryKeyField]: {
-            [_sequelize().Op.in]: ids
+            [_sequelize().Op.in]: ids.map(id => id['pk'])
           }
         };
-        return yield model.findAll(_objectSpread(_objectSpread({}, (0, _lodash().omit)(opts, ['limit', 'offset'])), {}, {
-          where,
-          transaction
-        }));
+        return yield (0, _utils.handleAppendsQuery)({
+          queryPromises: opts.include.map(include => {
+            return model.findAll(_objectSpread(_objectSpread({}, (0, _lodash().omit)(opts, ['limit', 'offset'])), {}, {
+              include: include,
+              where,
+              transaction
+            })).then(rows => {
+              return {
+                rows,
+                include
+              };
+            });
+          }),
+          templateModel: ids[0].row
+        });
       }
 
       return yield model.findAll(_objectSpread(_objectSpread({}, opts), {}, {
@@ -237,6 +262,12 @@ class Repository {
     var _this5 = this;
 
     return _asyncToGenerator(function* () {
+      if (Array.isArray(options.values)) {
+        return _this5.createMany(_objectSpread(_objectSpread({}, options), {}, {
+          records: options.values
+        }));
+      }
+
       const transaction = yield _this5.getTransaction(options);
 
       const guard = _updateGuard.UpdateGuard.fromOptions(_this5.model, _objectSpread(_objectSpread({}, options), {}, {
@@ -474,7 +505,7 @@ __decorate([transaction()], Repository.prototype, "create", null);
 
 __decorate([transaction()], Repository.prototype, "createMany", null);
 
-__decorate([transaction()], Repository.prototype, "update", null);
+__decorate([transaction(), (0, _mustHaveFilterDecorator.default)()], Repository.prototype, "update", null);
 
 __decorate([transaction((args, transaction) => {
   return {

package/lib/update-associations.js

@@ -161,47 +161,55 @@ function _updateAssociations() {
 
     const keys = Object.keys(values);
 
-    for (var _i2 = 0, _Object$keys = Object.keys(modelAssociations(instance)); _i2 < _Object$keys.length; _i2++) {
-      const key = _Object$keys[_i2];
-
-      if (keys.includes(key)) {
-        yield updateAssociation(instance, key, values[key], _objectSpread(_objectSpread({}, options), {}, {
-          transaction
-        }));
-      }
-    } // update through table values
+    try {
+      for (var _i2 = 0, _Object$keys = Object.keys(modelAssociations(instance)); _i2 < _Object$keys.length; _i2++) {
+        const key = _Object$keys[_i2];
 
+        if (keys.includes(key)) {
+          yield updateAssociation(instance, key, values[key], _objectSpread(_objectSpread({}, options), {}, {
+            transaction
+          }));
+        }
+      } // update through table values
 
-    var _iterator2 = _createForOfIteratorHelper(belongsToManyAssociations(instance)),
-        _step2;
 
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        const belongsToMany = _step2.value;
-        // @ts-ignore
-        const throughModel = belongsToMany.through.model;
-        const throughModelName = throughModel.name;
+      var _iterator2 = _createForOfIteratorHelper(belongsToManyAssociations(instance)),
+          _step2;
 
-        if (values[throughModelName] && options.sourceModel) {
-          const where = {
-            [belongsToMany.foreignKey]: instance.get(belongsToMany.sourceKey),
-            [belongsToMany.otherKey]: options.sourceModel.get(belongsToMany.targetKey)
-          };
-          yield throughModel.update(values[throughModel.name], {
-            where,
-            context: options.context,
-            transaction
-          });
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          const belongsToMany = _step2.value;
+          // @ts-ignore
+          const throughModel = belongsToMany.through.model;
+          const throughModelName = throughModel.name;
+
+          if (values[throughModelName] && options.sourceModel) {
+            const where = {
+              [belongsToMany.foreignKey]: instance.get(belongsToMany.sourceKey),
+              [belongsToMany.otherKey]: options.sourceModel.get(belongsToMany.targetKey)
+            };
+            yield throughModel.update(values[throughModel.name], {
+              where,
+              context: options.context,
+              transaction
+            });
+          }
         }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
       }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
 
-    if (newTransaction) {
-      yield transaction.commit();
+      if (newTransaction) {
+        yield transaction.commit();
+      }
+    } catch (error) {
+      if (newTransaction) {
+        yield transaction.rollback();
+      }
+
+      throw error;
     }
   });
   return _updateAssociations.apply(this, arguments);
@@ -294,11 +302,14 @@ function _updateSingleAssociation() {
       return false;
     }
 
+    if (Array.isArray(value)) {
+      throw new Error(`The value of '${key}' cannot be in array format`);
+    }
+
     const context = options.context,
           _options$updateAssoci = options.updateAssociationValues,
           updateAssociationValues = _options$updateAssoci === void 0 ? [] : _options$updateAssoci,
-          _options$transaction = options.transaction,
-          transaction = _options$transaction === void 0 ? yield model.sequelize.transaction() : _options$transaction;
+          transaction = options.transaction;
     const keys = getKeysByPrefix(updateAssociationValues, key);
 
     try {
@@ -311,11 +322,6 @@ function _updateSingleAssociation() {
             transaction
           });
           model.setDataValue(key, null);
-
-          if (!options.transaction) {
-            yield transaction.commit();
-          }
-
           return true;
         });
 
@@ -333,11 +339,6 @@ function _updateSingleAssociation() {
           context,
           transaction
         });
-
-        if (!options.transaction) {
-          yield transaction.commit();
-        }
-
         return true;
       }
 
@@ -347,11 +348,6 @@ function _updateSingleAssociation() {
           transaction
         });
         model.setDataValue(key, value);
-
-        if (!options.transaction) {
-          yield transaction.commit();
-        }
-
         return true;
       }
 
@@ -394,11 +390,6 @@ function _updateSingleAssociation() {
             updateAssociationValues: keys
           }));
           model.setDataValue(key, instance);
-
-          if (!options.transaction) {
-            yield transaction.commit();
-          }
-
           return true;
         }
       }
@@ -417,15 +408,7 @@ function _updateSingleAssociation() {
       if (association.targetKey) {
         model.setDataValue(association.foreignKey, instance[dataKey]);
       }
-
-      if (!options.transaction) {
-        yield transaction.commit();
-      }
     } catch (error) {
-      if (!options.transaction) {
-        yield transaction.rollback();
-      }
-
       throw error;
     }
   });
@@ -451,8 +434,7 @@ function _updateMultipleAssociation() {
     const context = options.context,
           _options$updateAssoci2 = options.updateAssociationValues,
           updateAssociationValues = _options$updateAssoci2 === void 0 ? [] : _options$updateAssoci2,
-          _options$transaction2 = options.transaction,
-          transaction = _options$transaction2 === void 0 ? yield model.sequelize.transaction() : _options$transaction2;
+          transaction = options.transaction;
     const keys = getKeysByPrefix(updateAssociationValues, key);
 
     try {
@@ -565,12 +547,7 @@ function _updateMultipleAssociation() {
       }
 
       model.setDataValue(key, list1.concat(list3));
-
-      if (!options.transaction) {
-        yield transaction.commit();
-      }
     } catch (error) {
-      yield transaction.rollback();
       throw error;
     }
   });

package/lib/utils.d.ts

@@ -0,0 +1,9 @@
+import { Model } from './model';
+declare type HandleAppendsQueryOptions = {
+    templateModel: any;
+    queryPromises: Array<any>;
+};
+export declare function handleAppendsQuery(options: HandleAppendsQueryOptions): Promise<Model<any, any>[]>;
+export declare function md5(value: string): string;
+export declare function checkIdentifier(value: string): void;
+export {};

package/lib/utils.js

@@ -0,0 +1,126 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.checkIdentifier = checkIdentifier;
+exports.handleAppendsQuery = handleAppendsQuery;
+exports.md5 = md5;
+
+function _crypto() {
+  const data = _interopRequireDefault(require("crypto"));
+
+  _crypto = function _crypto() {
+    return data;
+  };
+
+  return data;
+}
+
+var _identifierError = require("./errors/identifier-error");
+
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+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 _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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function handleAppendsQuery(_x) {
+  return _handleAppendsQuery.apply(this, arguments);
+}
+
+function _handleAppendsQuery() {
+  _handleAppendsQuery = _asyncToGenerator(function* (options) {
+    const templateModel = options.templateModel,
+          queryPromises = options.queryPromises;
+    const primaryKey = templateModel.constructor.primaryKeyAttribute;
+    const results = yield Promise.all(queryPromises);
+    let rows;
+
+    var _iterator = _createForOfIteratorHelper(results),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        const appendedResult = _step.value;
+
+        if (!rows) {
+          rows = appendedResult.rows;
+
+          if (rows.length == 0) {
+            return [];
+          }
+
+          const modelOptions = templateModel['_options'];
+
+          var _iterator2 = _createForOfIteratorHelper(rows),
+              _step2;
+
+          try {
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              const row = _step2.value;
+              row['_options'] = _objectSpread(_objectSpread({}, row['_options']), {}, {
+                include: modelOptions['include'],
+                includeNames: modelOptions['includeNames'],
+                includeMap: modelOptions['includeMap']
+              });
+            }
+          } catch (err) {
+            _iterator2.e(err);
+          } finally {
+            _iterator2.f();
+          }
+
+          continue;
+        }
+
+        for (let i = 0; i < appendedResult.rows.length; i++) {
+          const appendingRow = appendedResult.rows[i];
+          const key = appendedResult.include.association;
+          const val = appendingRow.get(key);
+          const rowKey = appendingRow.get(primaryKey);
+          const targetIndex = rows.findIndex(row => row.get(primaryKey) === rowKey);
+
+          if (targetIndex === -1) {
+            throw new Error('target row not found');
+          }
+
+          rows[targetIndex].set(key, val, {
+            raw: true
+          });
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+
+    return rows;
+  });
+  return _handleAppendsQuery.apply(this, arguments);
+}
+
+function md5(value) {
+  return _crypto().default.createHash('md5').update(value).digest('hex');
+}
+
+const MAX_IDENTIFIER_LENGTH = 63;
+
+function checkIdentifier(value) {
+  if (value.length > MAX_IDENTIFIER_LENGTH) {
+    throw new _identifierError.IdentifierError(`Identifier ${value} is too long`);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.7.4-alpha.4",
+  "version": "0.7.5-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,12 +12,14 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.7.4-alpha.4",
+    "@nocobase/utils": "0.7.5-alpha.1",
     "async-mutex": "^0.3.2",
+    "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
     "flat": "^5.0.2",
     "glob": "^7.1.6",
     "mathjs": "^10.6.1",
+    "moment": "2.x",
     "semver": "^7.3.7",
     "sequelize": "^6.9.0",
     "umzug": "^3.1.1"
@@ -30,5 +32,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "726c06b721b217a6aa5c1421b899d1315e552b57"
+  "gitHead": "f6eb27b68185bb0c0b4c2cfca1df84205a9b9173"
 }

package/src/__tests__/collection.test.ts

@@ -1,6 +1,7 @@
 import { Collection } from '../collection';
 import { Database } from '../database';
 import { mockDatabase } from './index';
+import { IdentifierError } from '../errors/identifier-error';
 
 describe('collection', () => {
   let db: Database;
@@ -258,4 +259,50 @@ describe('collection sync', () => {
     expect(tableFields['postId']).toBeDefined();
     expect(tableFields['tagId']).toBeDefined();
   });
+
+  test('limit table name length', async () => {
+    const longName =
+      'this_is_a_very_long_table_name_that_should_be_truncated_this_is_a_very_long_table_name_that_should_be_truncated';
+
+    let error;
+
+    try {
+      const collection = new Collection(
+        {
+          name: longName,
+          fields: [{ type: 'string', name: 'test' }],
+        },
+        {
+          database: db,
+        },
+      );
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error).toBeInstanceOf(IdentifierError);
+  });
+
+  test('limit field name length', async () => {
+    const longFieldName =
+      'this_is_a_very_long_field_name_that_should_be_truncated_this_is_a_very_long_field_name_that_should_be_truncated';
+
+    let error;
+
+    try {
+      const collection = new Collection(
+        {
+          name: 'test',
+          fields: [{ type: 'string', name: longFieldName }],
+        },
+        {
+          database: db,
+        },
+      );
+    } catch (e) {
+      error = e;
+    }
+
+    expect(error).toBeInstanceOf(IdentifierError);
+  });
 });

package/src/__tests__/database.test.ts

@@ -268,8 +268,10 @@ describe('database', () => {
     });
 
     await Test.sync();
+    expect(Test.model.prototype).toBeInstanceOf(CustomModel);
 
     const test = await Test.model.create<any>();
+    expect(test).toBeInstanceOf(CustomModel);
     test.customMethod();
     expect(test.get('abc')).toBe('abc');
   });