@nocobase/database 0.12.0-alpha.4 → 0.13.0-alpha.1

package/lib/database.js

@@ -680,6 +680,7 @@ class Database extends _events().EventEmitter {
             console.log('Connection has been established successfully.');
             return true;
           } catch (error) {
+            console.log(`Unable to connect to the database: ${error.message}`);
             if (count >= retry) {
               throw new Error('Connection failed, please check your database connection credentials and try again.');
             }

package/lib/eager-loading/eager-loading-tree.js

@@ -146,7 +146,7 @@ class EagerLoadingTree {
       };
       const loadRecursive = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (node, ids) {
-          const modelPrimaryKey = node.model.primaryKeyAttribute;
+          const modelPrimaryKey = node.model.primaryKeyField || node.model.primaryKeyAttribute;
           let instances = [];
           // load instances from database
           if (!node.parent) {

package/lib/fields/sort-field.js

@@ -120,7 +120,15 @@ class SortField extends _field.Field {
         const doInit = /*#__PURE__*/function () {
           var _ref6 = _asyncToGenerator(function* (scopeKey = null, scopeValue = null) {
             const queryInterface = _this.collection.db.sequelize.getQueryInterface();
+            if (scopeKey) {
+              const scopeField = _this.collection.getField(scopeKey);
+              if (!scopeField) {
+                throw new Error(`can not find scope field ${scopeKey} for collection ${_this.collection.name}`);
+              }
+              scopeKey = _this.collection.model.rawAttributes[scopeKey].field;
+            }
             const quotedOrderField = queryInterface.quoteIdentifier(orderField);
+            const sortColumnName = _this.collection.model.rawAttributes[_this.name].field;
             const sql = `
         WITH ordered_table AS (
           SELECT *, ROW_NUMBER() OVER (${scopeKey ? `PARTITION BY ${queryInterface.quoteIdentifier(scopeKey)}` : ''} ORDER BY ${quotedOrderField}) AS new_sequence_number
@@ -136,11 +144,11 @@ class SortField extends _field.Field {
         )
         ${_this.collection.db.inDialect('mysql') ? `
              UPDATE ${_this.collection.quotedTableName()}, ordered_table
-             SET ${_this.collection.quotedTableName()}.${_this.name} = ordered_table.new_sequence_number
+             SET ${_this.collection.quotedTableName()}.${sortColumnName} = ordered_table.new_sequence_number
              WHERE ${_this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
             ` : `
           UPDATE ${_this.collection.quotedTableName()}
-        SET ${queryInterface.quoteIdentifier(_this.name)} = ordered_table.new_sequence_number
+        SET ${queryInterface.quoteIdentifier(sortColumnName)} = ordered_table.new_sequence_number
         FROM ordered_table
         WHERE ${_this.collection.quotedTableName()}.${quotedOrderField} = ${queryInterface.quoteIdentifier('ordered_table')}.${quotedOrderField};
         `}

package/lib/relation-repository/belongs-to-many-repository.js

@@ -139,19 +139,8 @@ class BelongsToManyRepository extends _multipleRelationRepository.MultipleRelati
   setTargets(call, options) {
     var _this4 = this;
     return _asyncToGenerator(function* () {
-      let handleKeys;
+      const handleKeys = _this4.convertTks(options);
       const transaction = yield _this4.getTransaction(options, false);
-      if (_lodash().default.isPlainObject(options)) {
-        options = options.tk || [];
-      }
-      if (_lodash().default.isString(options) || _lodash().default.isNumber(options)) {
-        handleKeys = [options];
-      } // if it is type primaryKeyWithThroughValues
-      else if (_lodash().default.isArray(options) && options.length == 2 && _lodash().default.isPlainObject(options[0][1])) {
-        handleKeys = [options];
-      } else {
-        handleKeys = options;
-      }
       const sourceModel = yield _this4.getSourceModel(transaction);
       const setObj = handleKeys.reduce((carry, item) => {
         if (Array.isArray(item)) {

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

@@ -1,10 +1,9 @@
-import { AggregateOptions, DestroyOptions, FindOptions, TargetKey, TK } from '../repository';
+import { AggregateOptions, DestroyOptions, FindOptions, TK, TargetKey } from '../repository';
 import { AssociatedOptions, MultipleRelationRepository } from './multiple-relation-repository';
 export declare class HasManyRepository extends MultipleRelationRepository {
     find(options?: FindOptions): Promise<any>;
     aggregate(options: AggregateOptions): Promise<any>;
     destroy(options?: TK | DestroyOptions): Promise<boolean>;
-    handleKeyOfAdd(options: any): any;
     set(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     add(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     accessors(): import("sequelize").MultiAssociationAccessors;

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

@@ -101,21 +101,12 @@ class HasManyRepository extends _multipleRelationRepository.MultipleRelationRepo
       return true;
     })();
   }
-  handleKeyOfAdd(options) {
-    let handleKeys;
-    if (typeof options !== 'object' && !Array.isArray(options)) {
-      handleKeys = [options];
-    } else {
-      handleKeys = options['pk'];
-    }
-    return handleKeys;
-  }
   set(options) {
     var _this4 = this;
     return _asyncToGenerator(function* () {
       const transaction = yield _this4.getTransaction(options);
       const sourceModel = yield _this4.getSourceModel(transaction);
-      yield sourceModel[_this4.accessors().set](_this4.handleKeyOfAdd(options), {
+      yield sourceModel[_this4.accessors().set](_this4.convertTks(options), {
         transaction
       });
     })();
@@ -125,7 +116,7 @@ class HasManyRepository extends _multipleRelationRepository.MultipleRelationRepo
     return _asyncToGenerator(function* () {
       const transaction = yield _this5.getTransaction(options);
       const sourceModel = yield _this5.getSourceModel(transaction);
-      yield sourceModel[_this5.accessors().add](_this5.handleKeyOfAdd(options), {
+      yield sourceModel[_this5.accessors().add](_this5.convertTks(options), {
         transaction
       });
     })();
@@ -143,13 +134,13 @@ __decorate([(0, _relationRepository.transaction)((args, transaction) => {
 })], HasManyRepository.prototype, "destroy", null);
 __decorate([(0, _relationRepository.transaction)((args, transaction) => {
   return {
-    pk: args[0],
+    tk: args[0],
     transaction
   };
 })], HasManyRepository.prototype, "set", null);
 __decorate([(0, _relationRepository.transaction)((args, transaction) => {
   return {
-    pk: args[0],
+    tk: args[0],
     transaction
   };
 })], HasManyRepository.prototype, "add", null);

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

@@ -1,5 +1,5 @@
 import { MultiAssociationAccessors, Transaction, Transactionable } from 'sequelize';
-import { CommonFindOptions, CountOptions, DestroyOptions, Filter, FindOneOptions, FindOptions, TargetKey, TK, UpdateOptions } from '../repository';
+import { CommonFindOptions, CountOptions, DestroyOptions, Filter, FindOneOptions, FindOptions, TK, TargetKey, UpdateOptions } from '../repository';
 import { RelationRepository } from './relation-repository';
 export type FindAndCountOptions = CommonFindOptions;
 export interface AssociatedOptions extends Transactionable {

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

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MultipleRelationRepository = void 0;
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+  _lodash = function _lodash() {
     return data;
   };
   return data;
 }
-function _lodash() {
-  const data = _interopRequireDefault(require("lodash"));
-  _lodash = function _lodash() {
+function _sequelize() {
+  const data = require("sequelize");
+  _sequelize = function _sequelize() {
     return data;
   };
   return data;
@@ -113,12 +113,8 @@ class MultipleRelationRepository extends _relationRepository.RelationRepository
     var _this5 = this;
     return _asyncToGenerator(function* () {
       const transaction = yield _this5.getTransaction(options);
-      let handleKeys = options['tk'];
-      if (!Array.isArray(handleKeys)) {
-        handleKeys = [handleKeys];
-      }
       const sourceModel = yield _this5.getSourceModel(transaction);
-      yield sourceModel[_this5.accessors().removeMultiple](handleKeys, {
+      yield sourceModel[_this5.accessors().removeMultiple](_this5.convertTks(options), {
         transaction
       });
       return;

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

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

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

@@ -58,6 +58,20 @@ class RelationRepository {
   get collection() {
     return this.db.getCollection(this.targetModel.name);
   }
+  convertTk(options) {
+    let tk = options;
+    if (typeof options === 'object' && options['tk']) {
+      tk = options['tk'];
+    }
+    return tk;
+  }
+  convertTks(options) {
+    let tk = this.convertTk(options);
+    if (typeof tk === 'string') {
+      tk = tk.split(',');
+    }
+    return _lodash().default.castArray(tk);
+  }
   targetKey() {
     return this.associationField.targetKey;
   }

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

@@ -44,9 +44,8 @@ class SingleRelationRepository extends _relationRepository.RelationRepository {
     var _this2 = this;
     return _asyncToGenerator(function* () {
       const transaction = yield _this2.getTransaction(options);
-      const handleKey = _lodash().default.isPlainObject(options) ? options.tk : options;
       const sourceModel = yield _this2.getSourceModel(transaction);
-      return yield sourceModel[_this2.accessors().set](handleKey, {
+      return yield sourceModel[_this2.accessors().set](_this2.convertTk(options), {
         transaction
       });
     })();

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.12.0-alpha.4",
+  "version": "0.13.0-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.12.0-alpha.4",
-    "@nocobase/utils": "0.12.0-alpha.4",
+    "@nocobase/logger": "0.13.0-alpha.1",
+    "@nocobase/utils": "0.13.0-alpha.1",
     "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": "215dc3b2437c501ca903b56cc378ab5e81c8a11c"
+  "gitHead": "0ebd4e85a1b0b0d0943768ab6cb5c3d824562239"
 }