@nocobase/database 1.6.0-beta.3 → 1.6.0-beta.4

package/lib/collection.d.ts

@@ -29,15 +29,18 @@ export type DumpRules = BuiltInGroup | ({
 } & BaseDumpRules) | ({
     group: BuiltInGroup | string;
 } & BaseDumpRules);
+export type MigrationRule = 'overwrite' | 'skip' | 'upsert' | 'schema-only' | 'insert-ignore' | (string & {}) | null;
 export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {
     name: string;
     title?: string;
     namespace?: string;
+    migrationRules?: MigrationRule[];
     dumpRules?: DumpRules;
     tableName?: string;
     inherits?: string[] | string;
     viewName?: string;
     writableView?: boolean;
+    isThrough?: boolean;
     filterTargetKey?: string | string[];
     fields?: FieldOptions[];
     fieldSort?: string[];

package/lib/database.js

@@ -220,6 +220,7 @@ const _Database = class _Database extends import_events.EventEmitter {
       autoGenId: false,
       timestamps: false,
       dumpRules: "required",
+      migrationRules: ["schema-only", "overwrite"],
       origin: "@nocobase/database",
       fields: [{ type: "string", name: "name", primaryKey: true }]
     });

package/lib/dialects/mysql-dialect.d.ts

@@ -14,4 +14,5 @@ export declare class MysqlDialect extends BaseDialect {
         get: (v: string) => string;
         version: string;
     };
+    getSequelizeOptions(options: any): any;
 }

package/lib/dialects/mysql-dialect.js

@@ -32,6 +32,7 @@ __export(mysql_dialect_exports, {
   MysqlDialect: () => MysqlDialect
 });
 module.exports = __toCommonJS(mysql_dialect_exports);
+var import_utils = require("@nocobase/utils");
 var import_base_dialect = require("./base-dialect");
 const _MysqlDialect = class _MysqlDialect extends import_base_dialect.BaseDialect {
   getVersionGuard() {
@@ -44,6 +45,10 @@ const _MysqlDialect = class _MysqlDialect extends import_base_dialect.BaseDialec
       version: ">=8.0.17"
     };
   }
+  getSequelizeOptions(options) {
+    import_utils.lodash.set(options, "dialectOptions.multipleStatements", true);
+    return options;
+  }
 };
 __name(_MysqlDialect, "MysqlDialect");
 __publicField(_MysqlDialect, "dialectName", "mysql");

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

@@ -125,7 +125,10 @@ const _BelongsToManyField = class _BelongsToManyField extends import_relation_fi
       Through = database.getCollection(through);
     } else {
       const throughCollectionOptions = {
-        name: through
+        name: through,
+        isThrough: true,
+        sourceCollectionName: this.collection.name,
+        targetCollectionName: this.target
       };
       if (this.collection.options.dumpRules) {
         throughCollectionOptions["dumpRules"] = this.collection.options.dumpRules;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.6.0-beta.3",
+  "version": "1.6.0-beta.4",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.6.0-beta.3",
-    "@nocobase/utils": "1.6.0-beta.3",
+    "@nocobase/logger": "1.6.0-beta.4",
+    "@nocobase/utils": "1.6.0-beta.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": "19a659c49d7eedd3d57e46f9df2e8540f55c99b7"
+  "gitHead": "4419f433716dadf34886b261d9abe20e74551044"
 }