@nocobase/database 2.2.0-beta.16 → 2.2.0-beta.17

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

@@ -50,6 +50,23 @@ const pushAttribute = /* @__PURE__ */ __name((node, attribute) => {
     node.attributes.push(attribute);
   }
 }, "pushAttribute");
+const getRootModelOrderFields = /* @__PURE__ */ __name((node) => {
+  if (!import_lodash.default.isArray(node.order)) {
+    return [];
+  }
+  const fields = [];
+  for (const orderItem of node.order) {
+    if (!import_lodash.default.isArray(orderItem) || orderItem.length !== 2 || !import_lodash.default.isString(orderItem[0])) {
+      continue;
+    }
+    const fieldName = orderItem[0];
+    const attribute = node.model.rawAttributes[fieldName] || Object.values(node.model.rawAttributes).find((item) => item.field === fieldName);
+    if (attribute) {
+      fields.push(attribute.field || fieldName);
+    }
+  }
+  return fields;
+}, "getRootModelOrderFields");
 const EagerLoadingNodeProto = {
   afterBuild(db) {
     const collection = db.modelCollection.get(this.model);
@@ -218,11 +235,15 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           if (!primaryKeyField) {
             throw new Error(`Model ${node.model.name} does not have primary key`);
           }
+          const group = [`${node.model.name}.${primaryKeyField}`];
+          if (this.db.inDialect("mssql") || this.db.isMySQLCompatibleDialect()) {
+            group.push(...getRootModelOrderFields(node).map((field) => `${node.model.name}.${field}`));
+          }
           const ids2 = (await node.model.findAll({
             ...this.rootQueryOptions,
             includeIgnoreAttributes: false,
             attributes: [primaryKeyField],
-            group: `${node.model.name}.${primaryKeyField}`,
+            group: import_lodash.default.uniq(group),
             transaction,
             include: (0, import_utils.processIncludes)(includeForFilter, node.model),
             raw: true

package/lib/fields/belongs-to-many-field.js

@@ -128,6 +128,8 @@ const _BelongsToManyField = class _BelongsToManyField extends import_relation_fi
     let Through;
     if (database.hasCollection(through)) {
       Through = database.getCollection(through);
+      Through.options.sourceCollectionName ??= this.collection.name;
+      Through.options.targetCollectionName ??= this.target;
     } else {
       const throughCollectionOptions = {
         name: through,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.2.0-beta.16",
+  "version": "2.2.0-beta.17",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.2.0-beta.16",
-    "@nocobase/utils": "2.2.0-beta.16",
+    "@nocobase/logger": "2.2.0-beta.17",
+    "@nocobase/utils": "2.2.0-beta.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": "49d9bd2e21122eab9435f128375828b8c5bb4c07"
+  "gitHead": "d7a69c4f47fe38b17a2ce1408258902cf64f6c83"
 }