@nocobase/plugin-data-source-main 1.6.0-beta.3 → 1.6.0-beta.5

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-beta.3",
-  "@nocobase/database": "1.6.0-beta.3",
-  "@nocobase/plugin-error-handler": "1.6.0-beta.3",
-  "@nocobase/server": "1.6.0-beta.3",
+  "@nocobase/client": "1.6.0-beta.5",
+  "@nocobase/database": "1.6.0-beta.5",
+  "@nocobase/plugin-error-handler": "1.6.0-beta.5",
+  "@nocobase/server": "1.6.0-beta.5",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.6.0-beta.3",
-  "@nocobase/utils": "1.6.0-beta.3",
+  "@nocobase/test": "1.6.0-beta.5",
+  "@nocobase/utils": "1.6.0-beta.5",
   "sequelize": "6.35.2",
   "dayjs": "1.11.10"
 };

package/dist/server/collections/collectionCategories.js

@@ -33,6 +33,7 @@ var collectionCategories_default = {
   dumpRules: {
     group: "required"
   },
+  migrationRules: ["overwrite", "schema-only"],
   shared: true,
   name: "collectionCategories",
   autoGenId: true,

package/dist/server/collections/collections.js

@@ -31,6 +31,7 @@ __export(collections_exports, {
 module.exports = __toCommonJS(collections_exports);
 var collections_default = {
   dumpRules: "required",
+  migrationRules: ["overwrite", "schema-only"],
   shared: true,
   name: "collections",
   sortable: "sort",

package/dist/server/collections/fields.js

@@ -31,6 +31,7 @@ __export(fields_exports, {
 module.exports = __toCommonJS(fields_exports);
 var fields_default = {
   dumpRules: "required",
+  migrationRules: ["overwrite", "schema-only"],
   shared: true,
   name: "fields",
   autoGenId: false,

package/dist/server/migrations/20250123000001-remove-schema-options.d.ts

@@ -0,0 +1,13 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20250123000001-remove-schema-options.js

@@ -0,0 +1,52 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var remove_schema_options_exports = {};
+__export(remove_schema_options_exports, {
+  default: () => remove_schema_options_default
+});
+module.exports = __toCommonJS(remove_schema_options_exports);
+var import_server = require("@nocobase/server");
+/* istanbul ignore file -- @preserve */
+class remove_schema_options_default extends import_server.Migration {
+  on = "afterLoad";
+  async up() {
+    const CollectionRepository = this.context.db.getRepository("collections");
+    const collections = await CollectionRepository.find({
+      filter: {
+        "options.from": "db2cm"
+      }
+    });
+    for (const collection of collections) {
+      const collectionSchema = collection.get("schema");
+      const dbSchema = this.context.db.options.schema || "public";
+      if (collectionSchema && collectionSchema == dbSchema) {
+        collection.set("schema", void 0);
+        await collection.save();
+      }
+    }
+  }
+}

package/dist/server/repositories/collection-repository.js

@@ -153,9 +153,13 @@ class CollectionRepository extends import_database.Repository {
         ...field.options
       });
     }
+    const collectionOptions = options;
+    if (collectionOptions.schema && collectionOptions.schema == (this.database.options.schema || "public")) {
+      delete collectionOptions.schema;
+    }
     await this.create({
       values: {
-        ...options,
+        ...collectionOptions,
         fields,
         from: "db2cm"
       }

package/dist/server/server.js

@@ -45,16 +45,16 @@ var import_server = require("@nocobase/server");
 var import_lodash = __toESM(require("lodash"));
 var import_path = __toESM(require("path"));
 var import__ = require(".");
+var import_field_is_depended_on_by_other = require("./errors/field-is-depended-on-by-other");
+var import_field_name_exists_error = require("./errors/field-name-exists-error");
 var import_hooks = require("./hooks");
+var import_beforeCreateCheckFieldInMySQL = require("./hooks/beforeCreateCheckFieldInMySQL");
 var import_beforeCreateForValidateField = require("./hooks/beforeCreateForValidateField");
 var import_beforeCreateForViewCollection = require("./hooks/beforeCreateForViewCollection");
+var import_beforeDestoryField = require("./hooks/beforeDestoryField");
 var import_models = require("./models");
 var import_collections = __toESM(require("./resourcers/collections"));
 var import_views = __toESM(require("./resourcers/views"));
-var import_field_name_exists_error = require("./errors/field-name-exists-error");
-var import_beforeDestoryField = require("./hooks/beforeDestoryField");
-var import_field_is_depended_on_by_other = require("./errors/field-is-depended-on-by-other");
-var import_beforeCreateCheckFieldInMySQL = require("./hooks/beforeCreateCheckFieldInMySQL");
 class PluginDataSourceMainServer extends import_server.Plugin {
   loadFilter = {};
   setLoadFilter(filter) {
@@ -342,7 +342,6 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     });
   }
   async load() {
-    await this.importCollections(import_path.default.resolve(__dirname, "./collections"));
     this.db.getRepository("collections").setApp(this.app);
     const errorHandlerPlugin = this.app.getPlugin("error-handler");
     errorHandlerPlugin.errorHandler.register(

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.6.0-beta.3",
+  "version": "1.6.0-beta.5",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
@@ -22,7 +22,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "19a659c49d7eedd3d57e46f9df2e8540f55c99b7",
+  "gitHead": "66e7c7239b29361bc60543886d107ba0e00085d9",
   "keywords": [
     "Data sources"
   ]