@nocobase/database 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/database.js

@@ -5,154 +5,102 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extend = exports.defineCollection = exports.default = exports.DialectVersionAccessors = exports.Database = void 0;
 exports.extendCollection = extendCollection;
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 function _events() {
   const data = require("events");
-
   _events = function _events() {
     return data;
   };
-
   return data;
 }
-
 function _glob() {
   const data = _interopRequireDefault(require("glob"));
-
   _glob = function _glob() {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = require("path");
-
   _path = function _path() {
     return data;
   };
-
   return data;
 }
-
 function _semver() {
   const data = _interopRequireDefault(require("semver"));
-
   _semver = function _semver() {
     return data;
   };
-
   return data;
 }
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 function _umzug() {
   const data = require("umzug");
-
   _umzug = function _umzug() {
     return data;
   };
-
   return data;
 }
-
 var _collection = require("./collection");
-
 var _collectionImporter = require("./collection-importer");
-
 var _ReferencesMap = _interopRequireDefault(require("./features/ReferencesMap"));
-
 var _referentialIntegrityCheck = require("./features/referential-integrity-check");
-
 var FieldTypes = _interopRequireWildcard(require("./fields"));
-
 var _inheritedCollection = require("./inherited-collection");
-
 var _inheritedMap = _interopRequireDefault(require("./inherited-map"));
-
 var _migration = require("./migration");
-
 var _modelHook = require("./model-hook");
-
 var _operators = _interopRequireDefault(require("./operators"));
-
 var _utils2 = require("./utils");
-
 var _databaseUtils = _interopRequireDefault(require("./database-utils"));
-
+var _listeners = require("./listeners");
 var _valueParsers = require("./value-parsers");
-
+var _queryInterfaceBuilder = _interopRequireDefault(require("./query-interface/query-interface-builder"));
+var _collectionGroupManager = require("./collection-group-manager");
+var _viewCollection = require("./view-collection");
 const _excluded = ["drop"],
-      _excluded2 = ["retry"];
-
+  _excluded2 = ["retry"];
 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); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 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 _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 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 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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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); }); }; }
-
 const DialectVersionAccessors = {
   sqlite: {
     sql: 'select sqlite_version() as version',
@@ -164,7 +112,6 @@ const DialectVersionAccessors = {
       if (v.toLowerCase().includes('mariadb')) {
         return '';
       }
-
       const m = /([\d+\.]+)/.exec(v);
       return m[0];
     }
@@ -178,43 +125,32 @@ const DialectVersionAccessors = {
   }
 };
 exports.DialectVersionAccessors = DialectVersionAccessors;
-
 class DatabaseVersion {
   constructor(db) {
     this.db = void 0;
     this.db = db;
   }
-
   satisfies(versions) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       const accessors = DialectVersionAccessors;
-
       for (var _i = 0, _Object$keys = Object.keys(accessors); _i < _Object$keys.length; _i++) {
         const dialect = _Object$keys[_i];
-
         if (_this.db.inDialect(dialect)) {
           var _result$;
-
           if (!(versions === null || versions === void 0 ? void 0 : versions[dialect])) {
             return false;
           }
-
           const _yield$_this$db$seque = yield _this.db.sequelize.query(accessors[dialect].sql),
-                _yield$_this$db$seque2 = _slicedToArray(_yield$_this$db$seque, 1),
-                result = _yield$_this$db$seque2[0];
-
+            _yield$_this$db$seque2 = _slicedToArray(_yield$_this$db$seque, 1),
+            result = _yield$_this$db$seque2[0];
           return _semver().default.satisfies(accessors[dialect].get(result === null || result === void 0 ? void 0 : (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.version), versions[dialect]);
         }
       }
-
       return false;
     })();
   }
-
 }
-
 class Database extends _events().EventEmitter {
   constructor(options) {
     super();
@@ -231,6 +167,7 @@ class Database extends _events().EventEmitter {
     this.pendingFields = new Map();
     this.modelCollection = new Map();
     this.tableNameCollectionMap = new Map();
+    this.queryInterface = void 0;
     this.utils = new _databaseUtils.default(this);
     this.referenceMap = new _ReferencesMap.default();
     this.inheritanceMap = new _inheritedMap.default();
@@ -238,8 +175,9 @@ class Database extends _events().EventEmitter {
     this.modelHook = void 0;
     this.version = void 0;
     this.delayCollectionExtend = new Map();
+    this.logger = void 0;
+    this.collectionGroupManager = new _collectionGroupManager.CollectionGroupManager(this);
     this.version = new DatabaseVersion(this);
-
     const opts = _objectSpread({
       sync: {
         alter: {
@@ -248,64 +186,55 @@ class Database extends _events().EventEmitter {
         force: false
       }
     }, _lodash().default.clone(options));
-
     if (options.storage && options.storage !== ':memory:') {
       if (!(0, _path().isAbsolute)(options.storage)) {
         opts.storage = (0, _path().resolve)(process.cwd(), options.storage);
       }
     }
-
     if (options.dialect === 'sqlite') {
       delete opts.timezone;
     } else if (!opts.timezone) {
       opts.timezone = '+00:00';
     }
-
     if (options.dialect === 'postgres') {
       // https://github.com/sequelize/sequelize/issues/1774
       require('pg').defaults.parseInt8 = true;
     }
-
     this.options = opts;
-    this.sequelize = new (_sequelize().Sequelize)(opts);
+    this.sequelize = new (_sequelize().Sequelize)(this.sequelizeOptions(this.options));
+    this.queryInterface = (0, _queryInterfaceBuilder.default)(this);
     this.collections = new Map();
     this.modelHook = new _modelHook.ModelHook(this);
     this.on('afterDefineCollection', collection => {
       var _this$pendingFields$g, _this$delayCollection;
-
       // after collection defined, call bind method on pending fields
       (_this$pendingFields$g = this.pendingFields.get(collection.name)) === null || _this$pendingFields$g === void 0 ? void 0 : _this$pendingFields$g.forEach(field => field.bind());
       (_this$delayCollection = this.delayCollectionExtend.get(collection.name)) === null || _this$delayCollection === void 0 ? void 0 : _this$delayCollection.forEach(collectionExtend => {
         collection.updateOptions(collectionExtend.collectionOptions, collectionExtend.mergeOptions);
       });
-    }); // register database field types
-
+    });
+    // register database field types
     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];
-
+        name = _Object$entries$_i[0],
+        field = _Object$entries$_i[1];
       if (['Field', 'RelationField'].includes(name)) {
         continue;
       }
-
       let key = name.replace(/Field$/g, '');
       key = key.substring(0, 1).toLowerCase() + key.substring(1);
       this.registerFieldTypes({
         [key]: field
       });
     }
-
     (0, _valueParsers.registerFieldValueParsers)(this);
     this.initOperators();
     const migratorOptions = this.options.migrator || {};
-
     const context = _objectSpread({
       db: this,
       sequelize: this.sequelize,
       queryInterface: this.sequelize.getQueryInterface()
     }, migratorOptions.context);
-
     this.migrations = new _migration.Migrations(context);
     this.migrator = new (_umzug().Umzug)({
       logger: migratorOptions.logger || console,
@@ -321,7 +250,7 @@ class Database extends _events().EventEmitter {
       name: 'migrations',
       autoGenId: false,
       timestamps: false,
-      namespace: 'core',
+      namespace: 'core.migration',
       duplicator: 'required',
       fields: [{
         type: 'string',
@@ -336,48 +265,70 @@ class Database extends _events().EventEmitter {
     this.initListener();
     (0, _utils2.patchSequelizeQueryInterface)(this);
   }
-
+  setLogger(logger) {
+    this.logger = logger;
+  }
+  sequelizeOptions(options) {
+    if (options.dialect === 'postgres') {
+      options.hooks = {
+        afterConnect: function () {
+          var _afterConnect = _asyncToGenerator(function* (connection) {
+            yield connection.query('SET search_path TO public;');
+          });
+          function afterConnect(_x2) {
+            return _afterConnect.apply(this, arguments);
+          }
+          return afterConnect;
+        }()
+      };
+    }
+    return options;
+  }
   initListener() {
     var _this2 = this;
-
+    this.on('afterConnect', /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (client) {
+        if (_this2.inDialect('postgres')) {
+          yield client.query('SET search_path = public');
+        }
+      });
+      return function (_x3) {
+        return _ref.apply(this, arguments);
+      };
+    }());
     this.on('beforeDefine', (model, options) => {
-      if (this.options.underscored) {
+      if (this.options.underscored && options.underscored === undefined) {
         options.underscored = true;
       }
     });
     this.on('afterCreate', /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* (instance) {
+      var _ref2 = _asyncToGenerator(function* (instance) {
         var _instance$toChangedWi;
-
         instance === null || instance === void 0 ? void 0 : (_instance$toChangedWi = instance.toChangedWithAssociations) === null || _instance$toChangedWi === void 0 ? void 0 : _instance$toChangedWi.call(instance);
       });
-
-      return function (_x) {
-        return _ref.apply(this, arguments);
+      return function (_x4) {
+        return _ref2.apply(this, arguments);
       };
     }());
     this.on('afterUpdate', /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (instance) {
+      var _ref3 = _asyncToGenerator(function* (instance) {
         var _instance$toChangedWi2;
-
         instance === null || instance === void 0 ? void 0 : (_instance$toChangedWi2 = instance.toChangedWithAssociations) === null || _instance$toChangedWi2 === void 0 ? void 0 : _instance$toChangedWi2.call(instance);
       });
-
-      return function (_x2) {
-        return _ref2.apply(this, arguments);
+      return function (_x5) {
+        return _ref3.apply(this, arguments);
       };
     }());
     this.on('beforeDestroy', /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator(function* (instance, options) {
+      var _ref4 = _asyncToGenerator(function* (instance, options) {
         yield (0, _referentialIntegrityCheck.referentialIntegrityCheck)({
           db: _this2,
           referencedInstance: instance,
           transaction: options.transaction
         });
       });
-
-      return function (_x3, _x4) {
-        return _ref3.apply(this, arguments);
+      return function (_x6, _x7) {
+        return _ref4.apply(this, arguments);
       };
     }());
     this.on('afterRemoveCollection', collection => {
@@ -386,7 +337,6 @@ class Database extends _events().EventEmitter {
     this.on('afterDefine', model => {
       if (_lodash().default.get(this.options, 'usingBigIntForId', true)) {
         const idAttribute = model.rawAttributes['id'];
-
         if (idAttribute && idAttribute.primaryKey) {
           model.rawAttributes['id'].type = _sequelize().DataTypes.BIGINT;
           model.refreshAttributes();
@@ -399,11 +349,13 @@ class Database extends _events().EventEmitter {
       }
     });
     this.on('beforeDefineCollection', options => {
+      if (this.options.underscored && options.underscored === undefined) {
+        options.underscored = true;
+      }
       if (options.underscored) {
         if (_lodash().default.get(options, 'sortable.scopeKey')) {
           options.sortable.scopeKey = (0, _utils2.snakeCase)(options.sortable.scopeKey);
         }
-
         if (_lodash().default.get(options, 'indexes')) {
           // change index fields to snake case
           options.indexes = options.indexes.map(index => {
@@ -412,40 +364,62 @@ class Database extends _events().EventEmitter {
                 return (0, _utils2.snakeCase)(field);
               });
             }
-
             return index;
           });
         }
       }
-
       if (this.options.schema && !options.schema) {
         options.schema = this.options.schema;
       }
     });
+    this.on('afterRepositoryFind', ({
+      findOptions,
+      dataCollection,
+      data
+    }) => {
+      if (dataCollection.isParent()) {
+        var _iterator = _createForOfIteratorHelper(data),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            const row = _step.value;
+            const rowCollection = this.tableNameCollectionMap.get(findOptions.raw ? `${row['__schemaName']}.${row['__tableName']}` : `${row.get('__schemaName')}.${row.get('__tableName')}`);
+            if (!rowCollection) {
+              this.logger.warn(`Can not find collection by table name ${JSON.stringify(row)}, current collections: ${Array.from(this.tableNameCollectionMap.keys()).join(', ')}`);
+              return;
+            }
+            const rowCollectionName = rowCollection.name;
+            findOptions.raw ? row['__collection'] = rowCollectionName : row.set('__collection', rowCollectionName, {
+              raw: true
+            });
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
+    });
+    (0, _listeners.registerBuiltInListeners)(this);
   }
-
   addMigration(item) {
     return this.migrations.add(item);
   }
-
   addMigrations(options) {
     const namespace = options.namespace,
-          context = options.context,
-          _options$extensions = options.extensions,
-          extensions = _options$extensions === void 0 ? ['js', 'ts'] : _options$extensions,
-          directory = options.directory;
+      context = options.context,
+      _options$extensions = options.extensions,
+      extensions = _options$extensions === void 0 ? ['js', 'ts'] : _options$extensions,
+      directory = options.directory;
     const patten = `${directory}/*.{${extensions.join(',')}}`;
-
     const files = _glob().default.sync(patten, {
       ignore: ['**/*.d.ts']
     });
-
-    var _iterator = _createForOfIteratorHelper(files),
-        _step;
-
+    var _iterator2 = _createForOfIteratorHelper(files),
+      _step2;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        const file = _step.value;
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        const file = _step2.value;
         let filename = (0, _path().basename)(file);
         filename = filename.substring(0, filename.lastIndexOf('.')) || filename;
         this.migrations.add({
@@ -455,349 +429,278 @@ class Database extends _events().EventEmitter {
         });
       }
     } catch (err) {
-      _iterator.e(err);
+      _iterator2.e(err);
     } finally {
-      _iterator.f();
+      _iterator2.f();
     }
   }
-
   inDialect(...dialect) {
     return dialect.includes(this.sequelize.getDialect());
   }
+  escapeId(identifier) {
+    return this.inDialect('mysql') ? `\`${identifier}\`` : `"${identifier}"`;
+  }
   /**
    * Add collection to database
    * @param options
    */
-
-
   collection(options) {
+    options = _lodash().default.cloneDeep(options);
     if (this.options.underscored) {
       options.underscored = true;
     }
-
     this.emit('beforeDefineCollection', options);
-
     const hasValidInheritsOptions = (() => {
       return options.inherits && _lodash().default.castArray(options.inherits).length > 0;
     })();
-
-    const collection = hasValidInheritsOptions ? new _inheritedCollection.InheritedCollection(options, {
-      database: this
-    }) : new _collection.Collection(options, {
+    const hasViewOptions = options.viewName || options.view;
+    const collectionKlass = (() => {
+      if (hasValidInheritsOptions) {
+        return _inheritedCollection.InheritedCollection;
+      }
+      if (hasViewOptions) {
+        return _viewCollection.ViewCollection;
+      }
+      return _collection.Collection;
+    })();
+    const collection = new collectionKlass(options, {
       database: this
     });
     this.collections.set(collection.name, collection);
     this.emit('afterDefineCollection', collection);
     return collection;
   }
-
   getTablePrefix() {
     return this.options.tablePrefix || '';
   }
-
   getFieldByPath(path) {
     if (!path) {
       return;
     }
-
     const _path$split = path.split('.'),
-          _path$split2 = _toArray(_path$split),
-          collectionName = _path$split2[0],
-          associationName = _path$split2[1],
-          args = _path$split2.slice(2);
-
+      _path$split2 = _toArray(_path$split),
+      collectionName = _path$split2[0],
+      associationName = _path$split2[1],
+      args = _path$split2.slice(2);
     let collection = this.getCollection(collectionName);
-
     if (!collection) {
       return;
     }
-
     const field = collection.getField(associationName);
-
     if (!field) {
       return;
     }
-
     if (args.length > 0) {
       return this.getFieldByPath(`${field === null || field === void 0 ? void 0 : field.target}.${args.join('.')}`);
     }
-
     return field;
   }
   /**
    * get exists collection by its name
    * @param name
    */
-
-
   getCollection(name) {
     if (!name) {
       return null;
     }
-
     const _name$split = name.split('.'),
-          _name$split2 = _slicedToArray(_name$split, 2),
-          collectionName = _name$split2[0],
-          associationName = _name$split2[1];
-
+      _name$split2 = _slicedToArray(_name$split, 2),
+      collectionName = _name$split2[0],
+      associationName = _name$split2[1];
     let collection = this.collections.get(collectionName);
-
     if (associationName) {
       var _collection$getField;
-
       const target = (_collection$getField = collection.getField(associationName)) === null || _collection$getField === void 0 ? void 0 : _collection$getField.target;
       return target ? this.collections.get(target) : null;
     }
-
     return collection;
   }
-
   hasCollection(name) {
     return this.collections.has(name);
   }
-
   removeCollection(name) {
     const collection = this.collections.get(name);
     this.emit('beforeRemoveCollection', collection);
     collection.resetFields();
     const result = this.collections.delete(name);
     this.sequelize.modelManager.removeModel(collection.model);
-
     if (result) {
       this.emit('afterRemoveCollection', collection);
     }
-
     return collection;
   }
-
   getModel(name) {
     return this.getCollection(name).model;
   }
-
   getRepository(name, relationId) {
     var _this$getCollection;
-
     const _name$split3 = name.split('.'),
-          _name$split4 = _slicedToArray(_name$split3, 2),
-          collection = _name$split4[0],
-          relation = _name$split4[1];
-
+      _name$split4 = _slicedToArray(_name$split3, 2),
+      collection = _name$split4[0],
+      relation = _name$split4[1];
     if (relation) {
       var _this$getRepository, _this$getRepository$r;
-
       return (_this$getRepository = this.getRepository(collection)) === null || _this$getRepository === void 0 ? void 0 : (_this$getRepository$r = _this$getRepository.relation(relation)) === null || _this$getRepository$r === void 0 ? void 0 : _this$getRepository$r.of(relationId);
     }
-
     return (_this$getCollection = this.getCollection(name)) === null || _this$getCollection === void 0 ? void 0 : _this$getCollection.repository;
   }
-
   addPendingField(field) {
     const associating = this.pendingFields;
     const items = this.pendingFields.get(field.target) || [];
     items.push(field);
     associating.set(field.target, items);
   }
-
   removePendingField(field) {
     const items = this.pendingFields.get(field.target) || [];
     const index = items.indexOf(field);
-
     if (index !== -1) {
       delete items[index];
       this.pendingFields.set(field.target, items);
     }
   }
-
   registerFieldTypes(fieldTypes) {
     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];
-
+        type = _Object$entries2$_i[0],
+        fieldType = _Object$entries2$_i[1];
       this.fieldTypes.set(type, fieldType);
     }
   }
-
   registerFieldValueParsers(parsers) {
     for (var _i4 = 0, _Object$entries3 = Object.entries(parsers); _i4 < _Object$entries3.length; _i4++) {
       const _Object$entries3$_i = _slicedToArray(_Object$entries3[_i4], 2),
-            type = _Object$entries3$_i[0],
-            parser = _Object$entries3$_i[1];
-
+        type = _Object$entries3$_i[0],
+        parser = _Object$entries3$_i[1];
       this.fieldValueParsers.set(type, parser);
     }
   }
-
   buildFieldValueParser(field, ctx) {
     const Parser = this.fieldValueParsers.has(field.type) ? this.fieldValueParsers.get(field.type) : this.fieldValueParsers.get('default');
     const parser = new Parser(field, ctx);
     return parser;
   }
-
   registerModels(models) {
     for (var _i5 = 0, _Object$entries4 = Object.entries(models); _i5 < _Object$entries4.length; _i5++) {
       const _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
-            type = _Object$entries4$_i[0],
-            schemaType = _Object$entries4$_i[1];
-
+        type = _Object$entries4$_i[0],
+        schemaType = _Object$entries4$_i[1];
       this.models.set(type, schemaType);
     }
   }
-
   registerRepositories(repositories) {
     for (var _i6 = 0, _Object$entries5 = Object.entries(repositories); _i6 < _Object$entries5.length; _i6++) {
       const _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2),
-            type = _Object$entries5$_i[0],
-            schemaType = _Object$entries5$_i[1];
-
+        type = _Object$entries5$_i[0],
+        schemaType = _Object$entries5$_i[1];
       this.repositories.set(type, schemaType);
     }
   }
-
   initOperators() {
-    const operators = new Map(); // Sequelize 内置
-
+    const operators = new Map();
+    // Sequelize 内置
     for (const key in _sequelize().Op) {
       operators.set('$' + key, _sequelize().Op[key]);
-
       const val = _sequelize().Utils.underscoredIf(key, true);
-
       operators.set('$' + val, _sequelize().Op[key]);
       operators.set('$' + val.replace(/_/g, ''), _sequelize().Op[key]);
     }
-
     this.operators = operators;
     this.registerOperators(_objectSpread({}, _operators.default));
   }
-
   registerOperators(operators) {
     for (var _i7 = 0, _Object$entries6 = Object.entries(operators); _i7 < _Object$entries6.length; _i7++) {
       const _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2),
-            key = _Object$entries6$_i[0],
-            operator = _Object$entries6$_i[1];
-
+        key = _Object$entries6$_i[0],
+        operator = _Object$entries6$_i[1];
       this.operators.set(key, operator);
     }
   }
-
   buildField(options, context) {
     const type = options.type;
     const Field = this.fieldTypes.get(type);
-
     if (!Field) {
       throw Error(`unsupported field type ${type}`);
     }
-
-    if (options.field && this.options.underscored) {
+    if (options.field && context.collection.options.underscored) {
       options.field = (0, _utils2.snakeCase)(options.field);
     }
-
     return new Field(options, context);
   }
-
   sync(options) {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       const isMySQL = _this3.sequelize.getDialect() === 'mysql';
-
       if (isMySQL) {
         yield _this3.sequelize.query('SET FOREIGN_KEY_CHECKS = 0', null);
       }
-
       if (_this3.options.schema && _this3.inDialect('postgres')) {
         yield _this3.sequelize.query(`CREATE SCHEMA IF NOT EXISTS "${_this3.options.schema}"`, null);
       }
-
       const result = yield _this3.sequelize.sync(options);
-
       if (isMySQL) {
         yield _this3.sequelize.query('SET FOREIGN_KEY_CHECKS = 1', null);
       }
-
       return result;
     })();
   }
-
   clean(options) {
     var _this4 = this;
-
     return _asyncToGenerator(function* () {
-      const _ref4 = options || {},
-            drop = _ref4.drop,
-            others = _objectWithoutProperties(_ref4, _excluded);
-
+      const _ref5 = options || {},
+        drop = _ref5.drop,
+        others = _objectWithoutProperties(_ref5, _excluded);
       if (drop !== true) {
         return;
       }
-
       if (_this4.options.schema) {
         const tableNames = (yield _this4.sequelize.getQueryInterface().showAllTables()).map(table => {
           return `"${_this4.options.schema}"."${table}"`;
         });
-        const skip = options.skip || []; // @ts-ignore
-
-        var _iterator2 = _createForOfIteratorHelper(tableNames),
-            _step2;
-
+        const skip = options.skip || [];
+        // @ts-ignore
+        var _iterator3 = _createForOfIteratorHelper(tableNames),
+          _step3;
         try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            const tableName = _step2.value;
-
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            const tableName = _step3.value;
             if (skip.includes(tableName)) {
               continue;
             }
-
             yield _this4.sequelize.query(`DROP TABLE IF EXISTS ${tableName} CASCADE`);
           }
         } catch (err) {
-          _iterator2.e(err);
+          _iterator3.e(err);
         } finally {
-          _iterator2.f();
+          _iterator3.f();
         }
-
         return;
       }
-
-      yield _this4.sequelize.getQueryInterface().dropAllTables(others);
+      yield _this4.queryInterface.dropAll(options);
     })();
   }
-
   collectionExistsInDb(name, options) {
     var _this5 = this;
-
     return _asyncToGenerator(function* () {
       const collection = _this5.getCollection(name);
-
       if (!collection) {
         return false;
       }
-
-      const tables = yield _this5.sequelize.getQueryInterface().showAllTables({
-        transaction: options === null || options === void 0 ? void 0 : options.transaction
-      });
-      return tables.includes(_this5.getCollection(name).model.tableName);
+      return yield _this5.queryInterface.collectionTableExists(collection, options);
     })();
   }
-
   isSqliteMemory() {
     return this.sequelize.getDialect() === 'sqlite' && _lodash().default.get(this.options, 'storage') == ':memory:';
   }
-
   auth(options = {}) {
     var _this6 = this;
-
     return _asyncToGenerator(function* () {
       const _options$retry = options.retry,
-            retry = _options$retry === void 0 ? 10 : _options$retry,
-            others = _objectWithoutProperties(options, _excluded2);
-
+        retry = _options$retry === void 0 ? 10 : _options$retry,
+        others = _objectWithoutProperties(options, _excluded2);
       const delay = ms => new Promise(yea => setTimeout(yea, ms));
-
       let count = 1;
-
       const authenticate = /*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator(function* () {
+        var _ref6 = _asyncToGenerator(function* () {
           try {
             yield _this6.sequelize.authenticate(others);
             console.log('Connection has been established successfully.');
@@ -806,86 +709,69 @@ class Database extends _events().EventEmitter {
             if (count >= retry) {
               throw new Error('Connection failed, please check your database connection credentials and try again.');
             }
-
             console.log('reconnecting...', count);
             ++count;
             yield delay(500);
             return yield authenticate();
           }
         });
-
         return function authenticate() {
-          return _ref5.apply(this, arguments);
+          return _ref6.apply(this, arguments);
         };
       }();
-
       return yield authenticate();
     })();
   }
-
   prepare() {
     var _this7 = this;
-
     return _asyncToGenerator(function* () {
       if (_this7.inDialect('postgres') && _this7.options.schema && _this7.options.schema != 'public') {
         yield _this7.sequelize.query(`CREATE SCHEMA IF NOT EXISTS "${_this7.options.schema}"`, null);
       }
     })();
   }
-
   reconnect() {
     var _this8 = this;
-
     return _asyncToGenerator(function* () {
       if (_this8.isSqliteMemory()) {
         return;
-      } // @ts-ignore
-
-
-      const ConnectionManager = _this8.sequelize.dialect.connectionManager.constructor; // @ts-ignore
-
-      const connectionManager = new ConnectionManager(_this8.sequelize.dialect, _this8.sequelize); // @ts-ignore
-
-      _this8.sequelize.dialect.connectionManager = connectionManager; // @ts-ignore
-
+      }
+      // @ts-ignore
+      const ConnectionManager = _this8.sequelize.dialect.connectionManager.constructor;
+      // @ts-ignore
+      const connectionManager = new ConnectionManager(_this8.sequelize.dialect, _this8.sequelize);
+      // @ts-ignore
+      _this8.sequelize.dialect.connectionManager = connectionManager;
+      // @ts-ignore
       _this8.sequelize.connectionManager = connectionManager;
     })();
   }
-
   closed() {
     // @ts-ignore
     return this.sequelize.connectionManager.pool._draining;
   }
-
   close() {
     var _this9 = this;
-
     return _asyncToGenerator(function* () {
       if (_this9.isSqliteMemory()) {
         return;
       }
-
       return _this9.sequelize.close();
     })();
   }
-
   on(event, listener) {
     // NOTE: to match if event is a sequelize or model type
     const type = this.modelHook.match(event);
-
     if (type && !this.modelHook.hasBoundEvent(type)) {
       this.sequelize.addHook(type, this.modelHook.buildSequelizeHook(type));
       this.modelHook.bindEvent(type);
     }
-
     return super.on(event, listener);
   }
-
   extendCollection(collectionOptions, mergeOptions) {
     collectionOptions = _lodash().default.cloneDeep(collectionOptions);
     const collectionName = collectionOptions.name;
     const existCollection = this.getCollection(collectionName);
-
     if (existCollection) {
       existCollection.updateOptions(collectionOptions, mergeOptions);
     } else {
@@ -896,48 +782,37 @@ class Database extends _events().EventEmitter {
       }]);
     }
   }
-
   import(options) {
     var _this10 = this;
-
     return _asyncToGenerator(function* () {
       const reader = new _collectionImporter.ImporterReader(options.directory, options.extensions);
       const modules = yield reader.read();
       const result = new Map();
-
-      var _iterator3 = _createForOfIteratorHelper(modules),
-          _step3;
-
+      var _iterator4 = _createForOfIteratorHelper(modules),
+        _step4;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          const module = _step3.value;
-
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          const module = _step4.value;
           if (module.extend) {
             _this10.extendCollection(module.collectionOptions, module.mergeOptions);
           } else {
             const collection = _this10.collection(module);
-
             if (options.from) {
               _this10.importedFrom.set(options.from, [...(_this10.importedFrom.get(options.from) || []), collection.name]);
             }
-
             result.set(collection.name, collection);
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
-
       return result;
     })();
   }
-
 }
-
 exports.Database = Database;
-
 function extendCollection(collectionOptions, mergeOptions) {
   return {
     collectionOptions,
@@ -945,14 +820,11 @@ function extendCollection(collectionOptions, mergeOptions) {
     extend: true
   };
 }
-
 const extend = extendCollection;
 exports.extend = extend;
-
 const defineCollection = collectionOptions => {
   return collectionOptions;
 };
-
 exports.defineCollection = defineCollection;
 (0, _utils().applyMixins)(Database, [_utils().AsyncEmitter]);
 var _default = Database;