@nocobase/database 1.7.0-alpha.3 → 1.7.0-alpha.4

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/index.d.ts

@@ -7,16 +7,20 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export { BaseError, BelongsToGetAssociationMixin, DataTypes, fn, HasManyCountAssociationsMixin, HasManyCreateAssociationMixin, HasManyGetAssociationsMixin, literal, ModelStatic, Op, SyncOptions, Transaction, UniqueConstraintError, ValidationError, ValidationErrorItem, where, } from 'sequelize';
+export * from './belongs-to-array/belongs-to-array-repository';
 export * from './collection';
 export * from './collection-group-manager';
 export * from './collection-importer';
 export * from './database';
 export { Database as default } from './database';
+export * from './dialects';
 export * from './field-repository/array-field-repository';
 export * from './fields';
 export * from './filter-match';
 export { default as FilterParser } from './filter-parser';
+export * from './helpers';
 export * from './inherited-collection';
+export * from './interfaces';
 export * from './magic-attribute-model';
 export * from './migration';
 export * from './mock-database';
@@ -24,17 +28,14 @@ export * from './model';
 export * from './relation-repository/belongs-to-many-repository';
 export * from './relation-repository/belongs-to-repository';
 export * from './relation-repository/hasmany-repository';
+export * from './relation-repository/hasone-repository';
 export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
-export * from './belongs-to-array/belongs-to-array-repository';
 export * from './repository';
+export { default as sqlParser, SQLParserTypes } from './sql-parser';
 export * from './update-associations';
 export { snakeCase } from './utils';
 export * from './value-parsers';
 export * from './view-collection';
-export * from './view/view-inference';
-export * from './helpers';
-export { default as sqlParser, SQLParserTypes } from './sql-parser';
-export * from './interfaces';
 export { default as fieldTypeMap } from './view/field-type-map';
-export * from './dialects';
+export * from './view/view-inference';

package/lib/index.js

@@ -62,16 +62,20 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_sequelize = require("sequelize");
+__reExport(src_exports, require("./belongs-to-array/belongs-to-array-repository"), module.exports);
 __reExport(src_exports, require("./collection"), module.exports);
 __reExport(src_exports, require("./collection-group-manager"), module.exports);
 __reExport(src_exports, require("./collection-importer"), module.exports);
 __reExport(src_exports, require("./database"), module.exports);
 var import_database = require("./database");
+__reExport(src_exports, require("./dialects"), module.exports);
 __reExport(src_exports, require("./field-repository/array-field-repository"), module.exports);
 __reExport(src_exports, require("./fields"), module.exports);
 __reExport(src_exports, require("./filter-match"), module.exports);
 var import_filter_parser = __toESM(require("./filter-parser"));
+__reExport(src_exports, require("./helpers"), module.exports);
 __reExport(src_exports, require("./inherited-collection"), module.exports);
+__reExport(src_exports, require("./interfaces"), module.exports);
 __reExport(src_exports, require("./magic-attribute-model"), module.exports);
 __reExport(src_exports, require("./migration"), module.exports);
 __reExport(src_exports, require("./mock-database"), module.exports);
@@ -79,20 +83,17 @@ __reExport(src_exports, require("./model"), module.exports);
 __reExport(src_exports, require("./relation-repository/belongs-to-many-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/belongs-to-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/hasmany-repository"), module.exports);
+__reExport(src_exports, require("./relation-repository/hasone-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/multiple-relation-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/single-relation-repository"), module.exports);
-__reExport(src_exports, require("./belongs-to-array/belongs-to-array-repository"), module.exports);
 __reExport(src_exports, require("./repository"), module.exports);
+var import_sql_parser = __toESM(require("./sql-parser"));
 __reExport(src_exports, require("./update-associations"), module.exports);
 var import_utils = require("./utils");
 __reExport(src_exports, require("./value-parsers"), module.exports);
 __reExport(src_exports, require("./view-collection"), module.exports);
-__reExport(src_exports, require("./view/view-inference"), module.exports);
-__reExport(src_exports, require("./helpers"), module.exports);
-var import_sql_parser = __toESM(require("./sql-parser"));
-__reExport(src_exports, require("./interfaces"), module.exports);
 var import_field_type_map = __toESM(require("./view/field-type-map"));
-__reExport(src_exports, require("./dialects"), module.exports);
+__reExport(src_exports, require("./view/view-inference"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseError,
@@ -116,14 +117,18 @@ __reExport(src_exports, require("./dialects"), module.exports);
   snakeCase,
   sqlParser,
   where,
+  ...require("./belongs-to-array/belongs-to-array-repository"),
   ...require("./collection"),
   ...require("./collection-group-manager"),
   ...require("./collection-importer"),
   ...require("./database"),
+  ...require("./dialects"),
   ...require("./field-repository/array-field-repository"),
   ...require("./fields"),
   ...require("./filter-match"),
+  ...require("./helpers"),
   ...require("./inherited-collection"),
+  ...require("./interfaces"),
   ...require("./magic-attribute-model"),
   ...require("./migration"),
   ...require("./mock-database"),
@@ -131,15 +136,12 @@ __reExport(src_exports, require("./dialects"), module.exports);
   ...require("./relation-repository/belongs-to-many-repository"),
   ...require("./relation-repository/belongs-to-repository"),
   ...require("./relation-repository/hasmany-repository"),
+  ...require("./relation-repository/hasone-repository"),
   ...require("./relation-repository/multiple-relation-repository"),
   ...require("./relation-repository/single-relation-repository"),
-  ...require("./belongs-to-array/belongs-to-array-repository"),
   ...require("./repository"),
   ...require("./update-associations"),
   ...require("./value-parsers"),
   ...require("./view-collection"),
-  ...require("./view/view-inference"),
-  ...require("./helpers"),
-  ...require("./interfaces"),
-  ...require("./dialects")
+  ...require("./view/view-inference")
 });

package/lib/mock-database.d.ts

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { Database, IDatabaseOptions } from './database';
+import { Database, IDatabaseOptions } from '@nocobase/database';
 export declare class MockDatabase extends Database {
     constructor(options: IDatabaseOptions);
 }
@@ -29,5 +29,6 @@ export declare function getConfigByEnv(): {
     dialectOptions: {};
 };
 declare function customLogger(queryString: any, queryObject: any): void;
+export declare function createMockDatabase(options?: IDatabaseOptions): Promise<MockDatabase>;
 export declare function mockDatabase(options?: IDatabaseOptions): MockDatabase;
 export {};

package/lib/mock-database.js

@@ -38,15 +38,16 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var mock_database_exports = {};
 __export(mock_database_exports, {
   MockDatabase: () => MockDatabase,
+  createMockDatabase: () => createMockDatabase,
   getConfigByEnv: () => getConfigByEnv,
   mockDatabase: () => mockDatabase
 });
 module.exports = __toCommonJS(mock_database_exports);
+var import_database = require("@nocobase/database");
 var import_utils = require("@nocobase/utils");
 var import_nanoid = require("nanoid");
 var import_node_fetch = __toESM(require("node-fetch"));
 var import_path = __toESM(require("path"));
-var import_database = require("./database");
 /* istanbul ignore file -- @preserve */
 const _MockDatabase = class _MockDatabase extends import_database.Database {
   constructor(options) {
@@ -91,8 +92,18 @@ function customLogger(queryString, queryObject) {
   }
 }
 __name(customLogger, "customLogger");
+async function createMockDatabase(options = {}) {
+  try {
+    const { runPluginStaticImports } = await import("@nocobase/server");
+    await runPluginStaticImports();
+  } catch (error) {
+  }
+  return mockDatabase(options);
+}
+__name(createMockDatabase, "createMockDatabase");
 function mockDatabase(options = {}) {
   const dbOptions = (0, import_utils.merge)(getConfigByEnv(), options);
+  let db;
   if (process.env["DB_TEST_PREFIX"]) {
     let configKey = "database";
     if (dbOptions.dialect === "sqlite") {
@@ -124,13 +135,14 @@ function mockDatabase(options = {}) {
       };
     }
   }
-  const db = new MockDatabase(dbOptions);
+  db = new MockDatabase(dbOptions);
   return db;
 }
 __name(mockDatabase, "mockDatabase");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MockDatabase,
+  createMockDatabase,
   getConfigByEnv,
   mockDatabase
 });

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-alpha.3",
+  "version": "1.7.0-alpha.4",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.7.0-alpha.3",
-    "@nocobase/utils": "1.7.0-alpha.3",
+    "@nocobase/logger": "1.7.0-alpha.4",
+    "@nocobase/utils": "1.7.0-alpha.4",
     "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": "153723ec01c4e9ba179f9d5a32190057dbed453f"
+  "gitHead": "e31c3136901b10ec7cbe4bbc8a22dc4cc7481f93"
 }