@nocobase/database 0.20.0-alpha.5 → 0.20.0-alpha.6

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

@@ -278,11 +278,15 @@ const _EagerLoadingTree = class _EagerLoadingTree {
         }
         if (associationType == "BelongsToMany") {
           const foreignKeyValues = node.parent.instances.map((instance) => instance.get(association.sourceKey));
-          const pivotAssoc = new import_sequelize.HasOne(association.target, association.through.model, {
+          const hasOneOptions = {
             as: "_pivot_",
             foreignKey: association.otherKey,
             sourceKey: association.targetKey
-          });
+          };
+          if (association.through.scope) {
+            hasOneOptions.scope = association.through.scope;
+          }
+          const pivotAssoc = new import_sequelize.HasOne(association.target, association.through.model, hasOneOptions);
           instances = await node.model.findAll({
             transaction,
             attributes: node.attributes,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.20.0-alpha.5",
+  "version": "0.20.0-alpha.6",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.20.0-alpha.5",
-    "@nocobase/utils": "0.20.0-alpha.5",
+    "@nocobase/logger": "0.20.0-alpha.6",
+    "@nocobase/utils": "0.20.0-alpha.6",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -35,5 +35,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "b72d7fdf357a6bc4460ff181644b9014d3dad13b"
+  "gitHead": "281767b02ce11f9172fb72e5e53ff98bc80b6eaf"
 }