@nocobase/database 0.12.0-alpha.2 → 0.12.0-alpha.4

package/lib/database.js

@@ -112,14 +112,14 @@ const DialectVersionAccessors = {
       if (v.toLowerCase().includes('mariadb')) {
         return '';
       }
-      const m = /([\d+\.]+)/.exec(v);
+      const m = /([\d+.]+)/.exec(v);
       return m[0];
     }
   },
   postgres: {
     sql: 'select version() as version',
     get: v => {
-      const m = /([\d+\.]+)/.exec(v);
+      const m = /([\d+.]+)/.exec(v);
       return _semver().default.minVersion(m[0]).version;
     }
   }
@@ -236,16 +236,6 @@ class Database extends _events().EventEmitter {
       queryInterface: this.sequelize.getQueryInterface()
     }, migratorOptions.context);
     this.migrations = new _migration.Migrations(context);
-    this.migrator = new (_umzug().Umzug)({
-      logger: migratorOptions.logger || console,
-      migrations: this.migrations.callback(),
-      context,
-      storage: new (_umzug().SequelizeStorage)(_objectSpread(_objectSpread({
-        modelName: `${this.options.tablePrefix || ''}migrations`
-      }, migratorOptions.storage), {}, {
-        sequelize: this.sequelize
-      }))
-    });
     this.sequelize.beforeDefine((model, opts) => {
       if (this.options.tablePrefix) {
         opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
@@ -259,9 +249,20 @@ class Database extends _events().EventEmitter {
       duplicator: 'required',
       fields: [{
         type: 'string',
-        name: 'name'
+        name: 'name',
+        primaryKey: true
       }]
     });
+    this.migrator = new (_umzug().Umzug)({
+      logger: migratorOptions.logger || console,
+      migrations: this.migrations.callback(),
+      context,
+      storage: new (_umzug().SequelizeStorage)(_objectSpread(_objectSpread({
+        modelName: `${this.options.tablePrefix || ''}migrations`
+      }, migratorOptions.storage), {}, {
+        sequelize: this.sequelize
+      }))
+    });
     this.initListener();
     (0, _utils2.patchSequelizeQueryInterface)(this);
   }
@@ -670,7 +671,7 @@ class Database extends _events().EventEmitter {
       const _options$retry = options.retry,
         retry = _options$retry === void 0 ? 10 : _options$retry,
         others = _objectWithoutProperties(options, _excluded2);
-      const delay = ms => new Promise(yea => setTimeout(yea, ms));
+      const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
       let count = 1;
       const authenticate = /*#__PURE__*/function () {
         var _ref6 = _asyncToGenerator(function* () {

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

@@ -11,6 +11,13 @@ function _sequelize() {
   };
   return data;
 }
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+  _lodash = function _lodash() {
+    return data;
+  };
+  return data;
+}
 var _targetCollectionDecorator = _interopRequireDefault(require("../decorators/target-collection-decorator"));
 var _updateAssociations = require("../update-associations");
 var _updateGuard = require("../update-guard");
@@ -123,8 +130,7 @@ class MultipleRelationRepository extends _relationRepository.RelationRepository
       const transaction = yield _this6.getTransaction(options);
       const guard = _updateGuard.UpdateGuard.fromOptions(_this6.targetModel, options);
       const values = guard.sanitize(options.values);
-      const queryOptions = _this6.buildQueryOptions(options);
-      const instances = yield _this6.find(_objectSpread(_objectSpread({}, queryOptions), {}, {
+      const instances = yield _this6.find(_objectSpread(_objectSpread({}, _lodash().default.omit(options, ['values'])), {}, {
         transaction
       }));
       var _iterator = _createForOfIteratorHelper(instances),

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.12.0-alpha.2",
+  "version": "0.12.0-alpha.4",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.12.0-alpha.2",
-    "@nocobase/utils": "0.12.0-alpha.2",
+    "@nocobase/logger": "0.12.0-alpha.4",
+    "@nocobase/utils": "0.12.0-alpha.4",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "dayjs": "^1.11.8",
@@ -29,5 +29,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "a95e9e2666f0318c955113a4735bc005a2c9a767"
+  "gitHead": "215dc3b2437c501ca903b56cc378ab5e81c8a11c"
 }