@nocobase/database 1.7.0-beta.5 → 1.7.0-beta.6

package/lib/collection.js

@@ -287,9 +287,20 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     if (!field) {
       return;
     }
-    if (options.type !== field.type) {
-      throw new Error(`fields with same column must be of the same type ${JSON.stringify(options)}`);
+    if (options.type === field.type) {
+      return;
+    }
+    const isContextTypeMatch = /* @__PURE__ */ __name((data, dataType) => {
+      var _a, _b;
+      return [(_a = data.dataType) == null ? void 0 : _a.key, (_b = data.type) == null ? void 0 : _b.toUpperCase()].includes(dataType == null ? void 0 : dataType.toUpperCase());
+    }, "isContextTypeMatch");
+    if (options.type === "context" && isContextTypeMatch(field, options.dataType)) {
+      return;
+    }
+    if (field.type === "context" && isContextTypeMatch(options, field.dataType.key)) {
+      return;
     }
+    throw new Error(`fields with same column must be of the same type ${JSON.stringify(options)}`);
   }
   /**
    * @internal

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

@@ -56,7 +56,7 @@ var import_relation_repository = require("./relation-repository");
 const _BelongsToManyRepository = class _BelongsToManyRepository extends import_multiple_relation_repository.MultipleRelationRepository {
   async aggregate(options) {
     const targetRepository = this.targetCollection.repository;
-    const sourceModel = await this.getSourceModel();
+    const sourceModel = await this.getSourceModel(await this.getTransaction(options));
     const association = this.association;
     return await targetRepository.aggregate({
       ...options,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.7.0-beta.5",
+  "version": "1.7.0-beta.6",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.7.0-beta.5",
-    "@nocobase/utils": "1.7.0-beta.5",
+    "@nocobase/logger": "1.7.0-beta.6",
+    "@nocobase/utils": "1.7.0-beta.6",
     "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": "d95f10c4f23f2f2ee245880b4e900854c40bd114"
+  "gitHead": "4f1d3fa20b508322cc063b424588123e4ecc1c5f"
 }