@nocobase/database 1.6.15 → 1.6.17

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

@@ -80,7 +80,13 @@ const _HasManyRepository = class _HasManyRepository extends import_multiple_rela
     if (options && options["filter"]) {
       const filterResult = this.parseFilter(options["filter"], options);
       if (filterResult.include && filterResult.include.length > 0) {
-        return await this.destroyByFilter(options["filter"], transaction2);
+        return await this.destroyByFilter(
+          {
+            filter: options["filter"],
+            filterByTk: options["filterByTk"]
+          },
+          transaction2
+        );
       }
       where.push(filterResult.where);
     }

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

@@ -18,7 +18,10 @@ export declare abstract class MultipleRelationRepository extends RelationReposit
     remove(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     update(options?: UpdateOptions): Promise<any>;
     destroy(options?: TargetKey | DestroyOptions): Promise<boolean>;
-    protected destroyByFilter(filter: Filter, transaction?: Transaction): Promise<boolean>;
+    protected destroyByFilter(options: {
+        filter?: Filter;
+        filterByTk?: TargetKey | TargetKey[];
+    }, transaction?: Transaction): Promise<boolean>;
     protected filterHasInclude(filter: Filter, options?: any): boolean;
     protected accessors(): MultiAssociationAccessors;
     updateOrCreate(options: FirstOrCreateOptions): Promise<any>;

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

@@ -174,9 +174,9 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
   async destroy(options) {
     return false;
   }
-  async destroyByFilter(filter, transaction2) {
+  async destroyByFilter(options, transaction2) {
     const instances = await this.find({
-      filter,
+      ...options,
       transaction: transaction2
     });
     return await this.destroy({

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.6.15",
+  "version": "1.6.17",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.6.15",
-    "@nocobase/utils": "1.6.15",
+    "@nocobase/logger": "1.6.17",
+    "@nocobase/utils": "1.6.17",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "4628ae31452340bcb502e6a32e79f3d7f7349222"
+  "gitHead": "9067874312fef0d31e8127c8b499f6c37e99846e"
 }