@nocobase/plugin-data-source-main 2.1.0-beta.26 → 2.1.0-beta.27

package/dist/externalVersion.js

@@ -8,16 +8,16 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.26",
+  "@nocobase/client": "2.1.0-beta.27",
   "lodash": "4.18.1",
-  "@nocobase/ai": "2.1.0-beta.26",
-  "@nocobase/database": "2.1.0-beta.26",
-  "@nocobase/plugin-error-handler": "2.1.0-beta.26",
-  "@nocobase/server": "2.1.0-beta.26",
+  "@nocobase/ai": "2.1.0-beta.27",
+  "@nocobase/database": "2.1.0-beta.27",
+  "@nocobase/plugin-error-handler": "2.1.0-beta.27",
+  "@nocobase/server": "2.1.0-beta.27",
   "sequelize": "6.35.2",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/test": "2.1.0-beta.26",
-  "@nocobase/utils": "2.1.0-beta.26",
-  "@nocobase/actions": "2.1.0-beta.26",
+  "@nocobase/test": "2.1.0-beta.27",
+  "@nocobase/utils": "2.1.0-beta.27",
+  "@nocobase/actions": "2.1.0-beta.27",
   "dayjs": "1.11.13"
 };

package/dist/server/models/collection.js

@@ -41,6 +41,7 @@ __export(collection_exports, {
 module.exports = __toCommonJS(collection_exports);
 var import_database = require("@nocobase/database");
 var import_lodash = __toESM(require("lodash"));
+const databaseSyncedCollectionSources = ["db2cm", "dbsync"];
 class CollectionModel extends import_database.MagicAttributeModel {
   get db() {
     return this.constructor.database;
@@ -72,7 +73,7 @@ class CollectionModel extends import_database.MagicAttributeModel {
     if (!this.db.inDialect("postgres") && collectionOptions.schema) {
       delete collectionOptions.schema;
     }
-    if (this.db.inDialect("postgres") && !collectionOptions.schema && collectionOptions.from !== "db2cm") {
+    if (this.db.inDialect("postgres") && !collectionOptions.schema && !databaseSyncedCollectionSources.includes(collectionOptions.from)) {
       collectionOptions.schema = process.env.COLLECTION_MANAGER_SCHEMA || this.db.options.schema || "public";
     }
     if (this.db.hasCollection(name)) {

package/dist/server/server.js

@@ -110,7 +110,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     });
     this.app.db.on("collections.beforeCreate", (0, import_beforeCreateForViewCollection.beforeCreateForViewCollection)(this.db));
     this.app.db.on("collections.beforeCreate", async (model, options) => {
-      if (this.app.db.getCollection(model.get("name")) && model.get("from") !== "db2cm" && !model.get("isThrough")) {
+      if (this.app.db.getCollection(model.get("name")) && !["db2cm", "dbsync"].includes(model.get("from")) && !model.get("isThrough")) {
         throw new Error(`Collection named ${model.get("name")} already exists`);
       }
     });

package/package.json

@@ -6,7 +6,7 @@
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.ru-RU": "Основная база данных NocoBase: поддерживает реляционные СУБД, включая PostgreSQL, MySQL, MariaDB и другие.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "2.1.0-beta.26",
+  "version": "2.1.0-beta.27",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/data-source-main",
@@ -25,7 +25,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "b17e1a72057813fa27d8435bf0f2af67ea4b059f",
+  "gitHead": "6d9e2d4ac3c6bf40951c8eb252860e47aa3a3c37",
   "keywords": [
     "Data sources"
   ]