@nocobase/database 0.7.1-alpha.7 → 0.7.2-alpha.3

package/lib/collection.d.ts

@@ -73,5 +73,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
      * @param options
      */
     updateField(name: string, options: FieldOptions): void;
+    addIndex(index: any): void;
+    removeIndex(fields: any): void;
     sync(syncOptions?: SyncOptions): Promise<void>;
 }

package/lib/collection.js

@@ -35,6 +35,16 @@ function _lodash() {
   return data;
 }
 
+function _sequelize() {
+  const data = require("sequelize");
+
+  _sequelize = function _sequelize() {
+    return data;
+  };
+
+  return data;
+}
+
 var _model = require("./model");
 
 var _repository = require("./repository");
@@ -356,6 +366,88 @@ class Collection extends _events().EventEmitter {
     this.setField(options.name || name, options);
   }
 
+  addIndex(index) {
+    if (!index) {
+      return;
+    }
+
+    let indexes = this.model.options.indexes || [];
+    let indexName = [];
+    let indexItem;
+
+    if (typeof index === 'string') {
+      indexItem = {
+        fields: [index]
+      };
+      indexName = [index];
+    } else if (Array.isArray(index)) {
+      indexItem = {
+        fields: index
+      };
+      indexName = index;
+    } else if (index === null || index === void 0 ? void 0 : index.fields) {
+      indexItem = index;
+      indexName = index.fields;
+    }
+
+    if (_lodash().default.isEqual(this.model.primaryKeyAttributes, indexName)) {
+      return;
+    }
+
+    const name = this.model.primaryKeyAttributes.join(',');
+
+    if (name.startsWith(`${indexName.join(',')},`)) {
+      return;
+    }
+
+    var _iterator3 = _createForOfIteratorHelper(indexes),
+        _step3;
+
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        const item = _step3.value;
+
+        if (_lodash().default.isEqual(item.fields, indexName)) {
+          return;
+        }
+
+        const name = item.fields.join(',');
+
+        if (name.startsWith(`${indexName.join(',')},`)) {
+          return;
+        }
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+
+    if (!indexItem) {
+      return;
+    }
+
+    indexes.push(indexItem);
+    this.model.options.indexes = indexes;
+    const tableName = this.model.getTableName(); // @ts-ignore
+
+    this.model._indexes = this.model.options.indexes // @ts-ignore
+    .map(index => _sequelize().Utils.nameIndex(this.model._conformIndex(index), tableName));
+  }
+
+  removeIndex(fields) {
+    if (!fields) {
+      return;
+    } // @ts-ignore
+
+
+    const indexes = this.model._indexes; // @ts-ignore
+
+    this.model._indexes = indexes.filter(item => {
+      return !_lodash().default.isEqual(item.fields, fields);
+    });
+  }
+
   sync(syncOptions) {
     var _this3 = this;
 

package/lib/database.d.ts

@@ -43,6 +43,11 @@ export declare type AddMigrationsOptions = {
     directory: string;
 };
 declare type OperatorFunc = (value: any, ctx?: RegisterOperatorsContext) => any;
+declare class DatabaseVersion {
+    db: Database;
+    constructor(db: Database);
+    satisfies(versions: any): Promise<boolean>;
+}
 export declare class Database extends EventEmitter implements AsyncEmitter {
     sequelize: Sequelize;
     migrator: Umzug;
@@ -56,6 +61,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     pendingFields: Map<string, FieldTypes.RelationField[]>;
     modelCollection: Map<ModelCtor<any>, Collection<any, any>>;
     modelHook: ModelHook;
+    version: DatabaseVersion;
     delayCollectionExtend: Map<string, {
         collectionOptions: CollectionOptions;
         mergeOptions?: any;
@@ -78,7 +84,6 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     getCollection(name: string): Collection;
     hasCollection(name: string): boolean;
     removeCollection(name: string): Collection<any, any>;
-    getCollectionFieldByPath(path: string): FieldTypes.Field;
     getModel<M extends Model>(name: string): ModelCtor<M>;
     getRepository<R extends Repository>(name: string): R;
     getRepository<R extends RelationRepository>(name: string, relationId: string | number): R;

package/lib/database.js

@@ -57,6 +57,16 @@ function _path() {
   return data;
 }
 
+function _semver() {
+  const data = _interopRequireDefault(require("semver"));
+
+  _semver = function _semver() {
+    return data;
+  };
+
+  return data;
+}
+
 function _sequelize() {
   const data = require("sequelize");
 
@@ -102,15 +112,13 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-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 _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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+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 _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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -124,11 +132,63 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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 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 _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 _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 _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; }
+class DatabaseVersion {
+  constructor(db) {
+    this.db = void 0;
+    this.db = db;
+  }
+
+  satisfies(versions) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      const dialects = {
+        sqlite: {
+          sql: 'select sqlite_version() as version',
+          get: v => v
+        },
+        mysql: {
+          sql: 'select version() as version',
+          get: v => v
+        },
+        postgres: {
+          sql: 'select version() as version',
+          get: v => {
+            const keys = v.split(' ');
+            keys.shift();
+            return _semver().default.minVersion(keys.shift()).version;
+          }
+        }
+      };
+
+      for (var _i = 0, _Object$keys = Object.keys(dialects); _i < _Object$keys.length; _i++) {
+        const dialect = _Object$keys[_i];
+
+        if (_this.db.inDialect(dialect)) {
+          var _result$, _result$2;
+
+          if (!(versions === null || versions === void 0 ? void 0 : versions[dialect])) {
+            return false;
+          }
+
+          const _yield$_this$db$seque = yield _this.db.sequelize.query(dialects[dialect].sql),
+                _yield$_this$db$seque2 = _slicedToArray(_yield$_this$db$seque, 1),
+                result = _yield$_this$db$seque2[0];
+
+          console.log(`db version: ${dialects[dialect].get(result === null || result === void 0 ? void 0 : (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.version)}`);
+          return _semver().default.satisfies(dialects[dialect].get(result === null || result === void 0 ? void 0 : (_result$2 = result[0]) === null || _result$2 === void 0 ? void 0 : _result$2.version), versions[dialect]);
+        }
+      }
+
+      return false;
+    })();
+  }
+
+}
 
 class Database extends _events().EventEmitter {
   constructor(options) {
@@ -145,7 +205,9 @@ class Database extends _events().EventEmitter {
     this.pendingFields = new Map();
     this.modelCollection = new Map();
     this.modelHook = void 0;
+    this.version = void 0;
     this.delayCollectionExtend = new Map();
+    this.version = new DatabaseVersion(this);
 
     const opts = _objectSpread({
       sync: {
@@ -182,8 +244,8 @@ class Database extends _events().EventEmitter {
       });
     }); // register database field types
 
-    for (var _i = 0, _Object$entries = Object.entries(FieldTypes); _i < _Object$entries.length; _i++) {
-      const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+    for (var _i2 = 0, _Object$entries = Object.entries(FieldTypes); _i2 < _Object$entries.length; _i2++) {
+      const _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2),
             name = _Object$entries$_i[0],
             field = _Object$entries$_i[1];
 
@@ -319,36 +381,6 @@ class Database extends _events().EventEmitter {
     return collection;
   }
 
-  getCollectionFieldByPath(path) {
-    const _path$split = path.split('.'),
-          _path$split2 = _toArray(_path$split),
-          collectionName = _path$split2[0],
-          fieldName = _path$split2[1],
-          others = _path$split2.slice(2);
-
-    const collection = this.getCollection(collectionName);
-
-    if (!collection) {
-      return;
-    }
-
-    const field = collection.getField(fieldName);
-
-    if (others.length === 0) {
-      return field;
-    }
-
-    if (field.target) {
-      const target = this.getCollection(field.target);
-
-      if (!target) {
-        return;
-      }
-
-      return target.getField(others[0]);
-    }
-  }
-
   getModel(name) {
     return this.getCollection(name).model;
   }
@@ -388,8 +420,8 @@ class Database extends _events().EventEmitter {
   }
 
   registerFieldTypes(fieldTypes) {
-    for (var _i2 = 0, _Object$entries2 = Object.entries(fieldTypes); _i2 < _Object$entries2.length; _i2++) {
-      const _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+    for (var _i3 = 0, _Object$entries2 = Object.entries(fieldTypes); _i3 < _Object$entries2.length; _i3++) {
+      const _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2),
             type = _Object$entries2$_i[0],
             fieldType = _Object$entries2$_i[1];
 
@@ -398,8 +430,8 @@ class Database extends _events().EventEmitter {
   }
 
   registerModels(models) {
-    for (var _i3 = 0, _Object$entries3 = Object.entries(models); _i3 < _Object$entries3.length; _i3++) {
-      const _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2),
+    for (var _i4 = 0, _Object$entries3 = Object.entries(models); _i4 < _Object$entries3.length; _i4++) {
+      const _Object$entries3$_i = _slicedToArray(_Object$entries3[_i4], 2),
             type = _Object$entries3$_i[0],
             schemaType = _Object$entries3$_i[1];
 
@@ -408,8 +440,8 @@ class Database extends _events().EventEmitter {
   }
 
   registerRepositories(repositories) {
-    for (var _i4 = 0, _Object$entries4 = Object.entries(repositories); _i4 < _Object$entries4.length; _i4++) {
-      const _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2),
+    for (var _i5 = 0, _Object$entries4 = Object.entries(repositories); _i5 < _Object$entries4.length; _i5++) {
+      const _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
             type = _Object$entries4$_i[0],
             schemaType = _Object$entries4$_i[1];
 
@@ -434,8 +466,8 @@ class Database extends _events().EventEmitter {
   }
 
   registerOperators(operators) {
-    for (var _i5 = 0, _Object$entries5 = Object.entries(operators); _i5 < _Object$entries5.length; _i5++) {
-      const _Object$entries5$_i = _slicedToArray(_Object$entries5[_i5], 2),
+    for (var _i6 = 0, _Object$entries5 = Object.entries(operators); _i6 < _Object$entries5.length; _i6++) {
+      const _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2),
             key = _Object$entries5$_i[0],
             operator = _Object$entries5$_i[1];
 
@@ -455,19 +487,19 @@ class Database extends _events().EventEmitter {
   }
 
   sync(options) {
-    var _this = this;
+    var _this2 = this;
 
     return _asyncToGenerator(function* () {
-      const isMySQL = _this.sequelize.getDialect() === 'mysql';
+      const isMySQL = _this2.sequelize.getDialect() === 'mysql';
 
       if (isMySQL) {
-        yield _this.sequelize.query('SET FOREIGN_KEY_CHECKS = 0', null);
+        yield _this2.sequelize.query('SET FOREIGN_KEY_CHECKS = 0', null);
       }
 
-      const result = yield _this.sequelize.sync(options);
+      const result = yield _this2.sequelize.sync(options);
 
       if (isMySQL) {
-        yield _this.sequelize.query('SET FOREIGN_KEY_CHECKS = 1', null);
+        yield _this2.sequelize.query('SET FOREIGN_KEY_CHECKS = 1', null);
       }
 
       return result;
@@ -475,26 +507,26 @@ class Database extends _events().EventEmitter {
   }
 
   clean(options) {
-    var _this2 = this;
+    var _this3 = this;
 
     return _asyncToGenerator(function* () {
       const drop = options.drop,
             others = _objectWithoutProperties(options, _excluded);
 
       if (drop) {
-        yield _this2.sequelize.getQueryInterface().dropAllTables(others);
+        yield _this3.sequelize.getQueryInterface().dropAllTables(others);
       }
     })();
   }
 
   collectionExistsInDb(name, options) {
-    var _this3 = this;
+    var _this4 = this;
 
     return _asyncToGenerator(function* () {
-      const tables = yield _this3.sequelize.getQueryInterface().showAllTables({
+      const tables = yield _this4.sequelize.getQueryInterface().showAllTables({
         transaction: options === null || options === void 0 ? void 0 : options.transaction
       });
-      return !!tables.find(table => table === `${_this3.getTablePrefix()}${name}`);
+      return !!tables.find(table => table === `${_this4.getTablePrefix()}${name}`);
     })();
   }
 
@@ -503,7 +535,7 @@ class Database extends _events().EventEmitter {
   }
 
   auth(options = {}) {
-    var _this4 = this;
+    var _this5 = this;
 
     return _asyncToGenerator(function* () {
       const _options$retry = options.retry,
@@ -517,7 +549,7 @@ class Database extends _events().EventEmitter {
       const authenticate = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* () {
           try {
-            yield _this4.sequelize.authenticate(others);
+            yield _this5.sequelize.authenticate(others);
             console.log('Connection has been established successfully.');
             return true;
           } catch (error) {
@@ -542,21 +574,21 @@ class Database extends _events().EventEmitter {
   }
 
   reconnect() {
-    var _this5 = this;
+    var _this6 = this;
 
     return _asyncToGenerator(function* () {
-      if (_this5.isSqliteMemory()) {
+      if (_this6.isSqliteMemory()) {
         return;
       } // @ts-ignore
 
 
-      const ConnectionManager = _this5.sequelize.dialect.connectionManager.constructor; // @ts-ignore
+      const ConnectionManager = _this6.sequelize.dialect.connectionManager.constructor; // @ts-ignore
 
-      const connectionManager = new ConnectionManager(_this5.sequelize.dialect, _this5.sequelize); // @ts-ignore
+      const connectionManager = new ConnectionManager(_this6.sequelize.dialect, _this6.sequelize); // @ts-ignore
 
-      _this5.sequelize.dialect.connectionManager = connectionManager; // @ts-ignore
+      _this6.sequelize.dialect.connectionManager = connectionManager; // @ts-ignore
 
-      _this5.sequelize.connectionManager = connectionManager;
+      _this6.sequelize.connectionManager = connectionManager;
     })();
   }
 
@@ -566,14 +598,14 @@ class Database extends _events().EventEmitter {
   }
 
   close() {
-    var _this6 = this;
+    var _this7 = this;
 
     return _asyncToGenerator(function* () {
-      if (_this6.isSqliteMemory()) {
+      if (_this7.isSqliteMemory()) {
         return;
       }
 
-      return _this6.sequelize.close();
+      return _this7.sequelize.close();
     })();
   }
 
@@ -590,7 +622,7 @@ class Database extends _events().EventEmitter {
   }
 
   import(options) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator(function* () {
       const reader = new _collectionImporter.ImporterReader(options.directory, options.extensions);
@@ -607,17 +639,17 @@ class Database extends _events().EventEmitter {
           if (module.extend) {
             const collectionName = module.collectionOptions.name;
 
-            const existCollection = _this7.getCollection(collectionName);
+            const existCollection = _this8.getCollection(collectionName);
 
             if (existCollection) {
               existCollection.updateOptions(module.collectionOptions, module.mergeOptions);
             } else {
-              const existDelayExtends = _this7.delayCollectionExtend.get(collectionName) || [];
+              const existDelayExtends = _this8.delayCollectionExtend.get(collectionName) || [];
 
-              _this7.delayCollectionExtend.set(collectionName, [...existDelayExtends, module]);
+              _this8.delayCollectionExtend.set(collectionName, [...existDelayExtends, module]);
             }
           } else {
-            const collection = _this7.collection(module);
+            const collection = _this8.collection(module);
 
             result.set(collection.name, collection);
           }

package/lib/fields/belongs-to-field.js

@@ -59,7 +59,8 @@ class BelongsToField extends _relationField.RelationField {
 
 
     const association = collection.model.belongsTo(Target, _objectSpread({
-      as: this.name
+      as: this.name,
+      constraints: false
     }, (0, _lodash().omit)(this.options, ['name', 'type', 'target']))); // inverse relation
     // this.TargetModel.hasMany(collection.model);
     // 建立关系之后从 pending 列表中删除
@@ -75,6 +76,7 @@ class BelongsToField extends _relationField.RelationField {
       this.options.sourceKey = association.sourceKey;
     }
 
+    this.collection.addIndex([this.options.foreignKey]);
     return true;
   }
 
@@ -99,7 +101,7 @@ class BelongsToField extends _relationField.RelationField {
 
     delete collection.model.associations[this.name]; // @ts-ignore
 
-    collection.model.refreshAttributes();
+    collection.model.refreshAttributes(); // this.collection.removeIndex([this.options.foreignKey]);
   }
 
 }

package/lib/fields/belongs-to-many-field.js

@@ -63,7 +63,9 @@ class BelongsToManyField extends _relationField.RelationField {
       });
     }
 
-    const association = collection.model.belongsToMany(Target, _objectSpread(_objectSpread({}, (0, _lodash().omit)(this.options, ['name', 'type', 'target'])), {}, {
+    const association = collection.model.belongsToMany(Target, _objectSpread(_objectSpread({
+      constraints: false
+    }, (0, _lodash().omit)(this.options, ['name', 'type', 'target'])), {}, {
       as: this.name,
       through: Through.model
     })); // 建立关系之后从 pending 列表中删除
@@ -86,6 +88,8 @@ class BelongsToManyField extends _relationField.RelationField {
       this.options.through = this.through;
     }
 
+    Through.addIndex([this.options.foreignKey]);
+    Through.addIndex([this.options.otherKey]);
     return true;
   }
 

package/lib/fields/field.js

@@ -209,11 +209,19 @@ class Field {
     model.rawAttributes[this.name] = this.toSequelize(); // @ts-ignore
 
     model.refreshAttributes();
+
+    if (this.options.index) {
+      this.context.collection.addIndex([this.name]);
+    }
   }
 
   unbind() {
     const model = this.context.collection.model;
     model.removeAttribute(this.name);
+
+    if (this.options.index) {
+      this.context.collection.removeIndex([this.name]);
+    }
   }
 
   toSequelize() {

package/lib/fields/has-many-field.js

@@ -58,10 +58,12 @@ class HasManyField extends _relationField.RelationField {
       delete collection.model.associations[this.name];
     }
 
-    const association = collection.model.hasMany(Target, _objectSpread({
+    const association = collection.model.hasMany(Target, _objectSpread(_objectSpread({
+      constraints: false
+    }, (0, _lodash().omit)(this.options, ['name', 'type', 'target'])), {}, {
       as: this.name,
       foreignKey: this.foreignKey
-    }, (0, _lodash().omit)(this.options, ['name', 'type', 'target']))); // inverse relation
+    })); // inverse relation
     // this.TargetModel.belongsTo(collection.model);
     // 建立关系之后从 pending 列表中删除
 
@@ -76,6 +78,18 @@ class HasManyField extends _relationField.RelationField {
       this.options.sourceKey = association.sourceKey;
     }
 
+    let tcoll;
+
+    if (this.target === collection.name) {
+      tcoll = collection;
+    } else {
+      tcoll = database.getCollection(this.target);
+    }
+
+    if (tcoll) {
+      tcoll.addIndex([this.options.foreignKey]);
+    }
+
     return true;
   }
 
@@ -86,7 +100,7 @@ class HasManyField extends _relationField.RelationField {
 
     database.removePendingField(this); // 如果关系表内没有显式的创建外键字段，删除关系时，外键也删除掉
 
-    const tcoll = database.collections.get(this.target);
+    const tcoll = database.getCollection(this.target);
     const foreignKey = this.options.foreignKey;
     const field = tcoll.findField(field => {
       if (field.name === foreignKey) {

package/lib/fields/has-one-field.js

@@ -61,10 +61,12 @@ class HasOneField extends _relationField.RelationField {
       return false;
     }
 
-    const association = collection.model.hasOne(Target, _objectSpread({
+    const association = collection.model.hasOne(Target, _objectSpread(_objectSpread({
+      constraints: false
+    }, (0, _lodash().omit)(this.options, ['name', 'type', 'target'])), {}, {
       as: this.name,
       foreignKey: this.foreignKey
-    }, (0, _lodash().omit)(this.options, ['name', 'type', 'target']))); // 建立关系之后从 pending 列表中删除
+    })); // 建立关系之后从 pending 列表中删除
 
     database.removePendingField(this);
 
@@ -77,6 +79,18 @@ class HasOneField extends _relationField.RelationField {
       this.options.sourceKey = association.sourceKey;
     }
 
+    let tcoll;
+
+    if (this.target === collection.name) {
+      tcoll = collection;
+    } else {
+      tcoll = database.getCollection(this.target);
+    }
+
+    if (tcoll) {
+      tcoll.addIndex([this.options.foreignKey]);
+    }
+
     return true;
   }
 

package/lib/relation-repository/relation-repository.d.ts

@@ -16,6 +16,7 @@ export declare abstract class RelationRepository {
     sourceInstance: Model;
     db: Database;
     constructor(sourceCollection: Collection, association: string, sourceKeyValue: string | number);
+    get collection(): Collection<any, any>;
     targetKey(): any;
     protected accessors(): import("sequelize").SingleAssociationAccessors | import("sequelize").MultiAssociationAccessors;
     create(options?: CreateOptions): Promise<any>;

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

@@ -71,6 +71,10 @@ class RelationRepository {
     this.targetCollection = this.sourceCollection.context.database.modelCollection.get(this.targetModel);
   }
 
+  get collection() {
+    return this.db.getCollection(this.targetModel.name);
+  }
+
   targetKey() {
     return this.associationField.targetKey;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.7.1-alpha.7",
+  "version": "0.7.2-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,12 +12,13 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.7.1-alpha.7",
+    "@nocobase/utils": "0.7.2-alpha.3",
     "async-mutex": "^0.3.2",
     "deepmerge": "^4.2.2",
     "flat": "^5.0.2",
     "glob": "^7.1.6",
     "mathjs": "^10.6.1",
+    "semver": "^7.3.7",
     "sequelize": "^6.9.0",
     "umzug": "^3.1.1"
   },
@@ -29,5 +30,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "87601930b09f7df3eec5d493b62a7ec27871caa1"
+  "gitHead": "7ab5ec36f6408dd2fab545970a08679e8c2820e5"
 }

package/src/__tests__/collection.test.ts

@@ -13,6 +13,22 @@ describe('collection', () => {
     await db.close();
   });
 
+  test.skip('indexes', async () => {
+    await db.clean({ drop: true });
+    const collection = db.collection({
+      name: 'test',
+      fields: [
+        {
+          type: 'string',
+          name: 'name',
+          index: true,
+        },
+      ],
+    });
+    collection.removeField('name');
+    await db.sync();
+  });
+
   test('removeFromDb', async () => {
     await db.clean({ drop: true });
     const collection = db.collection({

package/src/__tests__/update-associations.test.ts

@@ -1,6 +1,6 @@
 import { Collection } from '../collection';
 import { Database } from '../database';
-import { updateAssociation, updateAssociations } from '../update-associations';
+import { updateAssociations } from '../update-associations';
 import { mockDatabase } from './';
 
 describe('update associations', () => {
@@ -356,13 +356,14 @@ describe('update associations', () => {
   });
 
   describe('belongsToMany', () => {
-    let db;
-    let Post;
-    let Tag;
-    let PostTag;
+    let db: Database;
+    let Post: Collection;
+    let Tag: Collection;
+    let PostTag: Collection;
 
     beforeEach(async () => {
       db = mockDatabase();
+      await db.clean({ drop: true });
       PostTag = db.collection({
         name: 'posts_tags',
         fields: [{ type: 'string', name: 'tagged_at' }],
@@ -389,7 +390,7 @@ describe('update associations', () => {
     afterEach(async () => {
       await db.close();
     });
-    test('set through value', async () => {
+    test.only('set through value', async () => {
       const p1 = await Post.repository.create({
         values: {
           title: 'hello',
@@ -404,9 +405,12 @@ describe('update associations', () => {
           ],
         },
       });
-
-      const t1 = (await p1.getTags())[0];
-      expect(t1.posts_tags.tagged_at).toEqual('123');
+      const count = await PostTag.repository.count({
+        filter: {
+          tagged_at: '123',
+        },
+      });
+      expect(count).toEqual(1);
     });
   });
 });

package/src/collection.ts

@@ -1,7 +1,14 @@
 import merge from 'deepmerge';
 import { EventEmitter } from 'events';
 import { default as lodash, default as _ } from 'lodash';
-import { ModelCtor, ModelOptions, QueryInterfaceDropTableOptions, SyncOptions, Transactionable } from 'sequelize';
+import {
+  ModelCtor,
+  ModelOptions,
+  QueryInterfaceDropTableOptions,
+  SyncOptions,
+  Transactionable,
+  Utils
+} from 'sequelize';
 import { Database } from './database';
 import { Field, FieldOptions } from './fields';
 import { Model } from './model';
@@ -278,6 +285,67 @@ export class Collection<
     this.setField(options.name || name, options);
   }
 
+  addIndex(index: any) {
+    if (!index) {
+      return;
+    }
+    let indexes: any = this.model.options.indexes || [];
+    let indexName = [];
+    let indexItem;
+    if (typeof index === 'string') {
+      indexItem = {
+        fields: [index],
+      };
+      indexName = [index];
+    } else if (Array.isArray(index)) {
+      indexItem = {
+        fields: index,
+      };
+      indexName = index;
+    } else if (index?.fields) {
+      indexItem = index;
+      indexName = index.fields;
+    }
+    if (lodash.isEqual(this.model.primaryKeyAttributes, indexName)) {
+      return;
+    }
+    const name: string = this.model.primaryKeyAttributes.join(',');
+    if (name.startsWith(`${indexName.join(',')},`)) {
+      return;
+    }
+    for (const item of indexes) {
+      if (lodash.isEqual(item.fields, indexName)) {
+        return;
+      }
+      const name: string = item.fields.join(',');
+      if (name.startsWith(`${indexName.join(',')},`)) {
+        return;
+      }
+    }
+    if (!indexItem) {
+      return;
+    }
+    indexes.push(indexItem);
+    this.model.options.indexes = indexes;
+    const tableName = this.model.getTableName();
+    // @ts-ignore
+    this.model._indexes = this.model.options.indexes
+      // @ts-ignore
+      .map((index) => Utils.nameIndex(this.model._conformIndex(index), tableName));
+  }
+
+  removeIndex(fields: any) {
+    if (!fields) {
+      return;
+    }
+    // @ts-ignore
+    const indexes: any[] = this.model._indexes;
+    // @ts-ignore
+    this.model._indexes = indexes.filter((item) => {
+      return !lodash.isEqual(item.fields, fields);
+    });
+  }
+
   async sync(syncOptions?: SyncOptions) {
     const modelNames = [this.model.name];
 

package/src/database.ts

@@ -4,6 +4,7 @@ import { EventEmitter } from 'events';
 import glob from 'glob';
 import lodash from 'lodash';
 import { basename, isAbsolute, resolve } from 'path';
+import semver from 'semver';
 import {
   ModelCtor,
   Op,
@@ -65,6 +66,46 @@ export type AddMigrationsOptions = {
 
 type OperatorFunc = (value: any, ctx?: RegisterOperatorsContext) => any;
 
+class DatabaseVersion {
+  db: Database;
+
+  constructor(db: Database) {
+    this.db = db;
+  }
+
+  async satisfies(versions) {
+    const dialects = {
+      sqlite: {
+        sql: 'select sqlite_version() as version',
+        get: (v) => v,
+      },
+      mysql: {
+        sql: 'select version() as version',
+        get: (v) => v,
+      },
+      postgres: {
+        sql: 'select version() as version',
+        get: (v) => {
+          const keys = v.split(' ');
+          keys.shift();
+          return semver.minVersion(keys.shift()).version;
+        },
+      },
+    };
+    for (const dialect of Object.keys(dialects)) {
+      if (this.db.inDialect(dialect)) {
+        if (!versions?.[dialect]) {
+          return false;
+        }
+        const [result] = (await this.db.sequelize.query(dialects[dialect].sql)) as any;
+        console.log(`db version: ${dialects[dialect].get(result?.[0]?.version)}`);
+        return semver.satisfies(dialects[dialect].get(result?.[0]?.version), versions[dialect]);
+      }
+    }
+    return false;
+  }
+}
+
 export class Database extends EventEmitter implements AsyncEmitter {
   sequelize: Sequelize;
   migrator: Umzug;
@@ -79,12 +120,15 @@ export class Database extends EventEmitter implements AsyncEmitter {
   modelCollection = new Map<ModelCtor<any>, Collection>();
 
   modelHook: ModelHook;
+  version: DatabaseVersion;
 
   delayCollectionExtend = new Map<string, { collectionOptions: CollectionOptions; mergeOptions?: any }[]>();
 
   constructor(options: DatabaseOptions) {
     super();
 
+    this.version = new DatabaseVersion(this);
+
     const opts = {
       sync: {
         alter: {

package/src/fields/belongs-to-field.ts

@@ -28,6 +28,7 @@ export class BelongsToField extends RelationField {
     // define relation on sequelize model
     const association = collection.model.belongsTo(Target, {
       as: this.name,
+      constraints: false,
       ...omit(this.options, ['name', 'type', 'target']),
     });
 
@@ -45,7 +46,7 @@ export class BelongsToField extends RelationField {
       // @ts-ignore
       this.options.sourceKey = association.sourceKey;
     }
-
+    this.collection.addIndex([this.options.foreignKey]);
     return true;
   }
 
@@ -67,6 +68,7 @@ export class BelongsToField extends RelationField {
     delete collection.model.associations[this.name];
     // @ts-ignore
     collection.model.refreshAttributes();
+    // this.collection.removeIndex([this.options.foreignKey]);
   }
 }
 

package/src/fields/belongs-to-many-field.ts

@@ -37,6 +37,7 @@ export class BelongsToManyField extends RelationField {
     }
 
     const association = collection.model.belongsToMany(Target, {
+      constraints: false,
       ...omit(this.options, ['name', 'type', 'target']),
       as: this.name,
       through: Through.model,
@@ -57,6 +58,8 @@ export class BelongsToManyField extends RelationField {
     if (!this.options.through) {
       this.options.through = this.through;
     }
+    Through.addIndex([this.options.foreignKey]);
+    Through.addIndex([this.options.otherKey]);
     return true;
   }
 

package/src/fields/field.ts

@@ -171,11 +171,17 @@ export abstract class Field {
     model.rawAttributes[this.name] = this.toSequelize();
     // @ts-ignore
     model.refreshAttributes();
+    if (this.options.index) {
+      this.context.collection.addIndex([this.name]);
+    }
   }
 
   unbind() {
     const { model } = this.context.collection;
     model.removeAttribute(this.name);
+    if (this.options.index) {
+      this.context.collection.removeIndex([this.name]);
+    }
   }
 
   toSequelize(): any {

package/src/fields/has-many-field.ts

@@ -5,10 +5,10 @@ import {
   ForeignKeyOptions,
   HasManyOptions,
   HasManyOptions as SequelizeHasManyOptions,
-  Utils,
+  Utils
 } from 'sequelize';
-
-import { BaseRelationFieldOptions, MultipleRelationFieldOptions, RelationField } from './relation-field';
+import { Collection } from '../collection';
+import { MultipleRelationFieldOptions, RelationField } from './relation-field';
 
 export interface HasManyFieldOptions extends HasManyOptions {
   /**
@@ -93,11 +93,11 @@ export class HasManyField extends RelationField {
     }
 
     const association = collection.model.hasMany(Target, {
+      constraints: false,
+      ...omit(this.options, ['name', 'type', 'target']),
       as: this.name,
       foreignKey: this.foreignKey,
-      ...omit(this.options, ['name', 'type', 'target']),
     });
-
     // inverse relation
     // this.TargetModel.belongsTo(collection.model);
 
@@ -111,6 +111,15 @@ export class HasManyField extends RelationField {
       // @ts-ignore
       this.options.sourceKey = association.sourceKey;
     }
+    let tcoll: Collection;
+    if (this.target === collection.name) {
+      tcoll = collection;
+    } else {
+      tcoll = database.getCollection(this.target);
+    }
+    if (tcoll) {
+      tcoll.addIndex([this.options.foreignKey]);
+    }
     return true;
   }
 
@@ -119,7 +128,7 @@ export class HasManyField extends RelationField {
     // 如果关系字段还没建立就删除了，也同步删除待建立关联的关系字段
     database.removePendingField(this);
     // 如果关系表内没有显式的创建外键字段，删除关系时，外键也删除掉
-    const tcoll = database.collections.get(this.target);
+    const tcoll = database.getCollection(this.target);
     const foreignKey = this.options.foreignKey;
     const field = tcoll.findField((field) => {
       if (field.name === foreignKey) {

package/src/fields/has-one-field.ts

@@ -7,6 +7,7 @@ import {
   HasOneOptions as SequelizeHasOneOptions,
   Utils
 } from 'sequelize';
+import { Collection } from '../collection';
 import { BaseRelationFieldOptions, RelationField } from './relation-field';
 
 export interface HasOneFieldOptions extends HasOneOptions {
@@ -92,9 +93,10 @@ export class HasOneField extends RelationField {
       return false;
     }
     const association = collection.model.hasOne(Target, {
+      constraints: false,
+      ...omit(this.options, ['name', 'type', 'target']),
       as: this.name,
       foreignKey: this.foreignKey,
-      ...omit(this.options, ['name', 'type', 'target']),
     });
     // 建立关系之后从 pending 列表中删除
     database.removePendingField(this);
@@ -105,6 +107,15 @@ export class HasOneField extends RelationField {
       // @ts-ignore
       this.options.sourceKey = association.sourceKey;
     }
+    let tcoll: Collection;
+    if (this.target === collection.name) {
+      tcoll = collection;
+    } else {
+      tcoll = database.getCollection(this.target);
+    }
+    if (tcoll) {
+      tcoll.addIndex([this.options.foreignKey]);
+    }
     return true;
   }
 

package/src/relation-repository/relation-repository.ts

@@ -40,6 +40,10 @@ export abstract class RelationRepository {
     this.targetCollection = this.sourceCollection.context.database.modelCollection.get(this.targetModel);
   }
 
+  get collection() {
+    return this.db.getCollection(this.targetModel.name);
+  }
+
   targetKey() {
     return this.associationField.targetKey;
   }