@nocobase/plugin-data-source-main 2.0.48 → 2.0.50

package/dist/externalVersion.js

@@ -8,15 +8,15 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.48",
+  "@nocobase/client": "2.0.50",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.0.48",
-  "@nocobase/plugin-error-handler": "2.0.48",
-  "@nocobase/server": "2.0.48",
+  "@nocobase/database": "2.0.50",
+  "@nocobase/plugin-error-handler": "2.0.50",
+  "@nocobase/server": "2.0.50",
   "sequelize": "6.35.2",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/test": "2.0.48",
-  "@nocobase/utils": "2.0.48",
-  "@nocobase/actions": "2.0.48",
+  "@nocobase/test": "2.0.50",
+  "@nocobase/utils": "2.0.50",
+  "@nocobase/actions": "2.0.50",
   "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/repositories/collection-repository.js

@@ -85,6 +85,9 @@ class CollectionRepository extends import_database.Repository {
           return true;
         }
         const fields = nameMap[instanceName].get("fields");
+        if (!Array.isArray(fields)) {
+          return [];
+        }
         return fields.filter((field) => field["type"] === "belongsTo" || field["type"] === "belongsToMany").map((field) => field.get("name"));
       })();
       if (import_lodash.default.isArray(skipField) && skipField.length) {
@@ -106,6 +109,9 @@ class CollectionRepository extends import_database.Repository {
       });
       const skipField = (() => {
         const fields = nameMap[viewCollectionName].get("fields");
+        if (!Array.isArray(fields)) {
+          return [];
+        }
         return fields.filter((field) => {
           var _a;
           if (((_a = field.options) == null ? void 0 : _a.source) && (field["type"] === "belongsTo" || field["type"] === "belongsToMany")) {

package/dist/server/server.js

@@ -109,7 +109,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.0.48",
+  "version": "2.0.50",
   "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": "9a7e1e19953b501dedce4526a7231ea6c74dfa98",
+  "gitHead": "cd183287e7be7bb75349ad91a006f5fa53993962",
   "keywords": [
     "Data sources"
   ]