@nocobase/plugin-data-source-main 1.4.0-alpha → 1.4.0-alpha.0

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.4.0-alpha",
-  "@nocobase/database": "1.4.0-alpha",
-  "@nocobase/plugin-error-handler": "1.4.0-alpha",
-  "@nocobase/server": "1.4.0-alpha",
+  "@nocobase/client": "1.4.0-alpha.0",
+  "@nocobase/database": "1.4.0-alpha.0",
+  "@nocobase/plugin-error-handler": "1.4.0-alpha.0",
+  "@nocobase/server": "1.4.0-alpha.0",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.4.0-alpha",
-  "@nocobase/utils": "1.4.0-alpha",
+  "@nocobase/test": "1.4.0-alpha.0",
+  "@nocobase/utils": "1.4.0-alpha.0",
   "sequelize": "6.35.2",
   "dayjs": "1.11.10"
 };

package/dist/server/models/collection.js

@@ -72,6 +72,9 @@ 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") {
+      collectionOptions.schema = process.env.COLLECTION_MANAGER_SCHEMA || this.db.options.schema || "public";
+    }
     if (this.db.hasCollection(name)) {
       collection = this.db.getCollection(name);
       if (skipExist) {

package/dist/server/server.d.ts

@@ -9,7 +9,6 @@
 import { Filter } from '@nocobase/database';
 import { Plugin } from '@nocobase/server';
 export declare class PluginDataSourceMainServer extends Plugin {
-    schema: string;
     private loadFilter;
     setLoadFilter(filter: Filter): void;
     onSync(message: any): Promise<void>;

package/dist/server/server.js

@@ -45,7 +45,6 @@ var import_server = require("@nocobase/server");
 var import_async_mutex = require("async-mutex");
 var import_lodash = __toESM(require("lodash"));
 var import_path = __toESM(require("path"));
-var process = __toESM(require("process"));
 var import__ = require(".");
 var import_hooks = require("./hooks");
 var import_beforeCreateForValidateField = require("./hooks/beforeCreateForValidateField");
@@ -58,7 +57,6 @@ 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 {
-  schema;
   loadFilter = {};
   setLoadFilter(filter) {
     this.loadFilter = filter;
@@ -75,9 +73,6 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     }
   }
   async beforeLoad() {
-    if (this.app.db.inDialect("postgres")) {
-      this.schema = process.env.COLLECTION_MANAGER_SCHEMA || this.db.options.schema || "public";
-    }
     this.app.db.registerRepositories({
       CollectionRepository: import__.CollectionRepository
     });
@@ -92,11 +87,6 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         plugin: this
       }
     });
-    this.app.db.on("collections.beforeCreate", async (model) => {
-      if (this.app.db.inDialect("postgres") && this.schema && model.get("from") != "db2cm" && !model.get("schema")) {
-        model.set("schema", this.schema);
-      }
-    });
     this.app.db.on("collections.beforeCreate", (0, import_beforeCreateForViewCollection.beforeCreateForViewCollection)(this.db));
     this.app.db.on(
       "collections.afterSaveWithAssociations",
@@ -275,7 +265,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       });
     };
     this.app.on("beforeStart", loadCollections);
-    this.app.resourcer.use(async (ctx, next) => {
+    this.app.resourceManager.use(async function pushUISchemaWhenUpdateCollectionField(ctx, next) {
       const { resourceName, actionName } = ctx.action;
       if (resourceName === "collections.fields" && actionName === "update") {
         const { updateAssociationValues = [] } = ctx.action.params;
@@ -346,7 +336,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         };
       }
     );
-    this.app.resourcer.use(async (ctx, next) => {
+    this.app.resourceManager.use(async function mergeReverseFieldWhenSaveCollectionField(ctx, next) {
       if (ctx.action.resourceName === "collections.fields" && ["create", "update"].includes(ctx.action.actionName)) {
         ctx.action.mergeParams({
           updateAssociationValues: ["reverseField"]
@@ -376,7 +366,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         }
       }
     };
-    this.app.resourcer.use(async (ctx, next) => {
+    this.app.resourceManager.use(async function handleFieldSourceMiddleware(ctx, next) {
       var _a, _b;
       await next();
       if (ctx.action.resourceName === "collections" && ctx.action.actionName == "list" && ((_a = ctx.action.params) == null ? void 0 : _a.paginate) == "false") {

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.4.0-alpha",
+  "version": "1.4.0-alpha.0",
   "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": "f097a2bddec152522b5645bd5d451f4c866d2060",
+  "gitHead": "8ffa7b54bbaf720c0c9857da4b19a99110dffc4b",
   "keywords": [
     "Data sources"
   ]