@nocobase/plugin-data-source-manager 2.0.0-alpha.8 → 2.0.0-beta.1

package/dist/locale/ru-RU.json

@@ -0,0 +1,46 @@
+{
+  "Allow adding and modifying collection": "Разрешить добавление и изменение коллекции",
+  "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.": "Вы уверены, что хотите установить поле \"{{title}}\" в качестве уникального ключа записи? Это настройка нельзя будет изменить после её установки.",
+  "Available tables": "Available tables",
+  "Collections": "Коллекции",
+  "Connection successful": "Соединение успешно",
+  "Connection successful'": "Подключение успешно",
+  "Data source display name": "Отображаемое имя источника данных",
+  "Data source manager": "Менеджер источников данных",
+  "Data source name": "Имя источника данных",
+  "Data source synchronization in progress": "Выполняется синхронизация источника данных",
+  "Data source synchronization successful": "Синхронизация источника данных выполнена успешно",
+  "Data sources": "Источники данных",
+  "Database": "База данных",
+  "Description": "Описание",
+  "Display name": "Отображаемое имя",
+  "Failed": "Ошибка",
+  "Field database type": "Тип поля в базе данных",
+  "Field interface": "Интерфейс поля",
+  "Field synchronization confirmation prompt": "Are you sure you want to synchronize fields from database? Depends on the number of tables and fields, This operation may take anywhere from a few seconds to several dozen seconds. If you only need to sync specific tables, please use the \"Configure Fields\" - \"Sync from database\" for those tables.",
+  "Filter data based on the specific field, with the requirement that the field value must be unique.": "Фильтровать данные на основе определенного поля с требованием уникальности значения поля.",
+  "Filter target key": "Целевой ключ фильтра",
+  "Host": "Хост",
+  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "Если у коллекции отсутствует первичный ключ, необходимо настроить уникальный ключ записи для определения строковых записей в блоке, иначе создание блоков данных для коллекции будет невозможно.",
+  "Load tables from database": "Load tables from database",
+  "Loaded": "Загружено",
+  "Loading": "Загрузка",
+  "No external data source plugin installed": "Нет установленных плагинов внешних источников данных",
+  "OK": "OK",
+  "Password": "Пароль",
+  "Permissions": "Права доступа",
+  "Please select a field.": "Пожалуйста, выберите поле.",
+  "Port": "Порт",
+  "Reloading": "Перезагрузка",
+  "Select field": "Выбрать поле",
+  "Selected tables": "Selected tables",
+  "Status": "Статус",
+  "Storage": "Хранилище",
+  "Sync field changes from database": "Sync field changes from database",
+  "Test Connection": "Тест соединения",
+  "The following field types are not compatible and do not support output and display": "Следующие типы полей не совместимы и не поддерживают вывод и отображение",
+  "Type": "Тип",
+  "Unknown field type": "Неизвестный тип поля",
+  "Username": "Имя пользователя",
+  "View documentation": "Просмотр документации"
+}

package/dist/locale/tr-TR.json

@@ -0,0 +1,45 @@
+{
+  "Allow adding and modifying collection": "Allow adding and modifying collection",
+  "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.": "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.",
+  "Available tables": "Available tables",
+  "Collections": "Collections",
+  "Connection successful": "Connection successful",
+  "Data source display name": "Data source display name",
+  "Data source manager": "Data source manager",
+  "Data source name": "Data source name",
+  "Data source synchronization in progress": "Data source synchronization in progress",
+  "Data source synchronization successful": "Data source synchronization successful",
+  "Data sources": "Data sources",
+  "Database": "Database",
+  "Description": "Description",
+  "Display name": "Display name",
+  "Failed": "Failed",
+  "Field database type": "Field database type",
+  "Field interface": "Field interface",
+  "Field synchronization confirmation prompt": "Are you sure you want to synchronize fields from database? Depends on the number of tables and fields, This operation may take anywhere from a few seconds to several dozen seconds. If you only need to sync specific tables, please use the \"Configure Fields\" - \"Sync from database\" for those tables.",
+  "Filter data based on the specific field, with the requirement that the field value must be unique.": "Filter data based on the specific field, with the requirement that the field value must be unique.",
+  "Filter target key": "Filter target key",
+  "Host": "Host",
+  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.",
+  "Load tables from database": "Load tables from database",
+  "Loaded": "Loaded",
+  "Loading": "Loading",
+  "No external data source plugin installed": "No external data source plugin installed",
+  "OK": "OK",
+  "Password": "Password",
+  "Permissions": "Permissions",
+  "Please select a field.": "Please select a field.",
+  "Port": "Port",
+  "Reloading": "Reloading",
+  "Select field": "Select field",
+  "Selected tables": "Selected tables",
+  "Status": "Status",
+  "Storage": "Storage",
+  "Sync field changes from database": "Sync field changes from database",
+  "Test Connection": "Test Connection",
+  "The following field types are not compatible and do not support output and display": "The following field types are not compatible and do not support output and display",
+  "Type": "Type",
+  "Unknown field type": "Unknown field type",
+  "Username": "Username",
+  "View documentation": "View documentation"
+}

package/dist/locale/uk-UA.json

@@ -0,0 +1,45 @@
+{
+  "Allow adding and modifying collection": "Allow adding and modifying collection",
+  "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.": "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.",
+  "Available tables": "Available tables",
+  "Collections": "Collections",
+  "Connection successful": "Connection successful",
+  "Data source display name": "Data source display name",
+  "Data source manager": "Data source manager",
+  "Data source name": "Data source name",
+  "Data source synchronization in progress": "Data source synchronization in progress",
+  "Data source synchronization successful": "Data source synchronization successful",
+  "Data sources": "Data sources",
+  "Database": "Database",
+  "Description": "Description",
+  "Display name": "Display name",
+  "Failed": "Failed",
+  "Field database type": "Field database type",
+  "Field interface": "Field interface",
+  "Field synchronization confirmation prompt": "Are you sure you want to synchronize fields from database? Depends on the number of tables and fields, This operation may take anywhere from a few seconds to several dozen seconds. If you only need to sync specific tables, please use the \"Configure Fields\" - \"Sync from database\" for those tables.",
+  "Filter data based on the specific field, with the requirement that the field value must be unique.": "Filter data based on the specific field, with the requirement that the field value must be unique.",
+  "Filter target key": "Filter target key",
+  "Host": "Host",
+  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.",
+  "Load tables from database": "Load tables from database",
+  "Loaded": "Loaded",
+  "Loading": "Loading",
+  "No external data source plugin installed": "No external data source plugin installed",
+  "OK": "OK",
+  "Password": "Password",
+  "Permissions": "Permissions",
+  "Please select a field.": "Please select a field.",
+  "Port": "Port",
+  "Reloading": "Reloading",
+  "Select field": "Select field",
+  "Selected tables": "Selected tables",
+  "Status": "Status",
+  "Storage": "Storage",
+  "Sync field changes from database": "Sync field changes from database",
+  "Test Connection": "Test Connection",
+  "The following field types are not compatible and do not support output and display": "The following field types are not compatible and do not support output and display",
+  "Type": "Type",
+  "Unknown field type": "Unknown field type",
+  "Username": "Username",
+  "View documentation": "View documentation"
+}

package/dist/locale/vi-VN.json

@@ -0,0 +1,45 @@
+{
+  "Allow adding and modifying collection": "Allow adding and modifying collection",
+  "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.": "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.",
+  "Available tables": "Available tables",
+  "Collections": "Collections",
+  "Connection successful": "Connection successful",
+  "Data source display name": "Data source display name",
+  "Data source manager": "Data source manager",
+  "Data source name": "Data source name",
+  "Data source synchronization in progress": "Data source synchronization in progress",
+  "Data source synchronization successful": "Data source synchronization successful",
+  "Data sources": "Data sources",
+  "Database": "Database",
+  "Description": "Description",
+  "Display name": "Display name",
+  "Failed": "Thất bại",
+  "Field database type": "Field database type",
+  "Field interface": "Giao diện trường",
+  "Field synchronization confirmation prompt": "Are you sure you want to synchronize fields from database? Depends on the number of tables and fields, This operation may take anywhere from a few seconds to several dozen seconds. If you only need to sync specific tables, please use the \"Configure Fields\" - \"Sync from database\" for those tables.",
+  "Filter data based on the specific field, with the requirement that the field value must be unique.": "Filter data based on the specific field, with the requirement that the field value must be unique.",
+  "Filter target key": "Filter target key",
+  "Host": "Host",
+  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.",
+  "Load tables from database": "Load tables from database",
+  "Loaded": "Loaded",
+  "Loading": "Đang tải",
+  "No external data source plugin installed": "No external data source plugin installed",
+  "OK": "OK",
+  "Password": "Mật khẩu",
+  "Permissions": "Quyền",
+  "Please select a field.": "Please select a field.",
+  "Port": "Port",
+  "Reloading": "Reloading",
+  "Select field": "Select field",
+  "Selected tables": "Selected tables",
+  "Status": "Trạng thái",
+  "Storage": "Storage",
+  "Sync field changes from database": "Sync field changes from database",
+  "Test Connection": "Test Connection",
+  "The following field types are not compatible and do not support output and display": "The following field types are not compatible and do not support output and display",
+  "Type": "Loại",
+  "Unknown field type": "Unknown field type",
+  "Username": "Username",
+  "View documentation": "View documentation"
+}

package/dist/locale/zh-CN.json

@@ -1,40 +1,45 @@
 {
-  "Data source name": "数据源标识",
+  "Allow adding and modifying collection": "允许添加和修改数据表结构",
+  "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.": "你确定将 “{{title}}” 字段设置为主键吗？设置成功后不可修改。",
+  "Available tables": "可选数据表",
+  "Collections": "数据表",
+  "Connection successful": "连接成功",
   "Data source display name": "数据源名称",
-  "Host": "服务器地址",
-  "Port": "端口",
-  "Database": "数据库",
   "Data source manager": "数据源管理",
+  "Data source name": "数据源标识",
+  "Data source synchronization in progress": "数据源同步中",
+  "Data source synchronization successful": "数据源同步成功",
   "Data sources": "数据源",
-  "No external data source plugin installed": "未安装外部数据源",
-  "View documentation": "查看文档",
-  "Test Connection": "测试连接",
-  "Connection successful": "连接成功",
-  "Display name": "名称",
-  "Username": "用户名",
-  "Password": "密码",
-  "Type": "类型",
+  "Database": "数据库",
   "Description": "描述",
-  "Storage": "文件地址",
-  "Collections": "数据表",
-  "Permissions": "权限",
-  "Allow adding and modifying collection": "允许添加和修改数据表结构",
-  "Unknown field type": "未知字段类型",
-  "The following field types are not compatible and do not support output and display": "以下字段类型未适配，不支持输出和显示",
+  "Display name": "名称",
+  "Failed": "加载失败",
   "Field database type": "字段数据库类型",
   "Field interface": "UI类型",
-  "Status": "状态",
-  "Loading": "加载中",
-  "Failed": "加载失败",
+  "Field synchronization confirmation prompt": "确认要对所有数据表执行字段同步吗？取决于数据表和字段数量，可能会耗时几秒到几十秒。若只需同步个别表，请使用相应表的“配置字段” - “从数据库同步”进行操作。",
+  "Filter data based on the specific field, with the requirement that the field value must be unique.": "根据特定的字段筛选数据，字段值必须具备唯一性。",
+  "Filter target key": "筛选目标键",
+  "Host": "服务器地址",
+  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "当数据表没有主键时，你需要配置记录唯一标识符，用于在区块中定位行记录，不配置将无法创建该表的数据区块。",
+  "Load tables from database": "从数据库加载表",
   "Loaded": "已加载",
-  "Reloading": "加载中",
-  "Data source synchronization in progress": "数据源同步中",
-  "Data source synchronization successful": "数据源同步成功",
-  "Filter target key":"筛选目标键",
-  "Select field": "选择字段",
+  "Loading": "加载中",
+  "No external data source plugin installed": "未安装外部数据源",
   "OK": "确定",
+  "Password": "密码",
+  "Permissions": "权限",
   "Please select a field.": "请选择一个字段。",
-  "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.": "你确定将 “{{title}}” 字段设置为主键吗？设置成功后不可修改。",
-  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "当数据表没有主键时，你需要配置记录唯一标识符，用于在区块中定位行记录，不配置将无法创建该表的数据区块。",
-  "Filter data based on the specific field, with the requirement that the field value must be unique.": "根据特定的字段筛选数据，字段值必须具备唯一性。"
-}
+  "Port": "端口",
+  "Reloading": "加载中",
+  "Select field": "选择字段",
+  "Selected tables": "已选数据表",
+  "Status": "状态",
+  "Storage": "文件地址",
+  "Sync field changes from database": "从数据库同步字段变更",
+  "Test Connection": "测试连接",
+  "The following field types are not compatible and do not support output and display": "以下字段类型未适配，不支持输出和显示",
+  "Type": "类型",
+  "Unknown field type": "未知字段类型",
+  "Username": "用户名",
+  "View documentation": "查看文档"
+}

package/dist/locale/zh-TW.json

@@ -0,0 +1,45 @@
+{
+  "Allow adding and modifying collection": "Allow adding and modifying collection",
+  "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.": "Are you sure you want to set the \"{{title}}\" field as a record unique key? This setting cannot be changed after it's been set.",
+  "Available tables": "Available tables",
+  "Collections": "Collections",
+  "Connection successful": "Connection successful",
+  "Data source display name": "Data source display name",
+  "Data source manager": "Data source manager",
+  "Data source name": "Data source name",
+  "Data source synchronization in progress": "Data source synchronization in progress",
+  "Data source synchronization successful": "Data source synchronization successful",
+  "Data sources": "Data sources",
+  "Database": "Database",
+  "Description": "Description",
+  "Display name": "Display name",
+  "Failed": "Failed",
+  "Field database type": "Field database type",
+  "Field interface": "Field interface",
+  "Field synchronization confirmation prompt": "Are you sure you want to synchronize fields from database? Depends on the number of tables and fields, This operation may take anywhere from a few seconds to several dozen seconds. If you only need to sync specific tables, please use the \"Configure Fields\" - \"Sync from database\" for those tables.",
+  "Filter data based on the specific field, with the requirement that the field value must be unique.": "Filter data based on the specific field, with the requirement that the field value must be unique.",
+  "Filter target key": "Filter target key",
+  "Host": "Host",
+  "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.": "If a collection lacks a primary key, you must configure a unique record key to locate row records within a block, failure to configure this will prevent the creation of data blocks for the collection.",
+  "Load tables from database": "Load tables from database",
+  "Loaded": "Loaded",
+  "Loading": "Loading",
+  "No external data source plugin installed": "No external data source plugin installed",
+  "OK": "OK",
+  "Password": "Password",
+  "Permissions": "Permissions",
+  "Please select a field.": "Please select a field.",
+  "Port": "Port",
+  "Reloading": "Reloading",
+  "Select field": "Select field",
+  "Selected tables": "Selected tables",
+  "Status": "Status",
+  "Storage": "Storage",
+  "Sync field changes from database": "Sync field changes from database",
+  "Test Connection": "Test Connection",
+  "The following field types are not compatible and do not support output and display": "The following field types are not compatible and do not support output and display",
+  "Type": "Type",
+  "Unknown field type": "Unknown field type",
+  "Username": "Username",
+  "View documentation": "View documentation"
+}

package/dist/server/actions/data-sources.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { Context, Next } from '@nocobase/actions';
+declare const _default: {
+    "dataSources:listEnabled"(ctx: Context, next: Next): Promise<void>;
+    "dataSources:testConnection"(ctx: Context, next: Next): Promise<void>;
+    "dataSources:refresh"(ctx: Context, next: Next): Promise<void>;
+    "dataSources:readTables"(ctx: Context, next: Next): Promise<void>;
+    "dataSources:loadTables"(ctx: Context, next: Next): Promise<void>;
+};
+export default _default;

package/dist/server/actions/data-sources.js

@@ -0,0 +1,115 @@
+/**
+ * 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 data_sources_exports = {};
+__export(data_sources_exports, {
+  default: () => data_sources_default
+});
+module.exports = __toCommonJS(data_sources_exports);
+var import_utils = require("../utils");
+const canRefreshStatus = ["loaded", "loading-failed", "reloading-failed"];
+var data_sources_default = {
+  async ["dataSources:listEnabled"](ctx, next) {
+    const dataSources = await ctx.db.getRepository("dataSources").find({
+      filter: {
+        enabled: true,
+        "type.$ne": "main"
+      }
+    });
+    ctx.body = dataSources.map((dataSourceModel) => {
+      return (0, import_utils.mapDataSourceWithCollection)(ctx.app, dataSourceModel);
+    });
+    await next();
+  },
+  async ["dataSources:testConnection"](ctx, next) {
+    const { values } = ctx.action.params;
+    const { options, type } = values;
+    const klass = ctx.app.dataSourceManager.factory.getClass(type);
+    try {
+      await klass.testConnection(ctx.app.environment.renderJsonTemplate(options));
+    } catch (error) {
+      throw new Error(`Test connection failed: ${error.message}`);
+    }
+    ctx.body = {
+      success: true
+    };
+    await next();
+  },
+  async ["dataSources:refresh"](ctx, next) {
+    const plugin = ctx.app.pm.get("data-source-manager");
+    const { filterByTk, clientStatus } = ctx.action.params;
+    const dataSourceModel = await ctx.db.getRepository("dataSources").findOne({
+      filter: {
+        key: filterByTk
+      }
+    });
+    const currentStatus = plugin.dataSourceStatus[filterByTk];
+    if (canRefreshStatus.includes(currentStatus) && (clientStatus ? clientStatus && canRefreshStatus.includes(clientStatus) : true)) {
+      dataSourceModel.loadIntoApplication({
+        app: ctx.app,
+        refresh: true,
+        reuseDB: true
+      });
+      ctx.app.syncMessageManager.publish(plugin.name, {
+        type: "loadDataSource",
+        dataSourceKey: dataSourceModel.get("key")
+      });
+    }
+    ctx.body = {
+      status: plugin.dataSourceStatus[filterByTk]
+    };
+    await next();
+  },
+  async ["dataSources:readTables"](ctx, next) {
+    const { dataSourceKey, dbOptions } = ctx.action.params.values || {};
+    const dataSourceManager = ctx.app.dataSourceManager;
+    let dataSource;
+    if (dbOptions) {
+      dataSource = dataSourceManager.factory.create(dbOptions.type, {
+        name: dataSourceKey,
+        ...dbOptions
+      });
+    } else {
+      dataSource = dataSourceManager.dataSources.get(dataSourceKey);
+      if (!dataSource) {
+        throw new Error(`dataSource ${dataSourceKey} not found`);
+      }
+    }
+    const tables = await dataSource.readTables();
+    ctx.body = tables;
+    await next();
+  },
+  async ["dataSources:loadTables"](ctx, next) {
+    const { dataSourceKey, tables } = ctx.action.params.values || {};
+    const dataSourceManager = ctx.app.dataSourceManager;
+    const dataSource = dataSourceManager.dataSources.get(dataSourceKey);
+    if (!dataSource) {
+      throw new Error(`dataSource ${dataSourceKey} not found`);
+    }
+    await dataSource.loadTables(ctx, tables);
+    await next();
+  }
+};

package/dist/server/middlewares/load-tables.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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 { Context, Next } from '@nocobase/actions';
+export declare function loadDataSourceTablesIntoCollections(ctx: Context, next: Next): Promise<any>;

package/dist/server/middlewares/load-tables.js

@@ -0,0 +1,93 @@
+/**
+ * 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 __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var load_tables_exports = {};
+__export(load_tables_exports, {
+  loadDataSourceTablesIntoCollections: () => loadDataSourceTablesIntoCollections
+});
+module.exports = __toCommonJS(load_tables_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
+var import_constants = require("../constants");
+var import_lodash = __toESM(require("lodash"));
+async function loadDataSourceTablesIntoCollections(ctx, next) {
+  const { actionName, resourceName, params } = ctx.action;
+  if (resourceName === "dataSources" && (actionName === "create" || actionName === "update")) {
+    const dataSourcesRepo = ctx.app.db.getRepository("dataSources");
+    const { options, type, collections, key } = params.values || {};
+    const dataSourceProvider = actionName === "update" ? {
+      get: async () => {
+        const { filterByTk } = params;
+        const model = await dataSourcesRepo.findByTargetKey(filterByTk);
+        if (import_lodash.default.isEqual(model.get("options"), options)) {
+          return ctx.app.dataSourceManager.get(filterByTk);
+        } else {
+          return ctx.app.dataSourceManager.factory.create(model.type, {
+            name: filterByTk,
+            ...options
+          });
+        }
+      }
+    } : {
+      get: () => ctx.app.dataSourceManager.factory.create(type, {
+        name: key,
+        ...options
+      })
+    };
+    const dataSource = await dataSourceProvider.get();
+    dataSource.setLogger(ctx.logger);
+    if (!(dataSource instanceof import_data_source_manager.DatabaseDataSource)) {
+      return next();
+    }
+    if (options == null ? void 0 : options.addAllCollections) {
+      const allTables = await dataSource.introspector.getTables();
+      if (allTables.length > import_constants.ALLOW_MAX_COLLECTIONS_COUNT) {
+        throw new Error(
+          `The number of collections exceeds the limit of ${import_constants.ALLOW_MAX_COLLECTIONS_COUNT}. Please remove some collections before adding new ones.`
+        );
+      }
+    } else {
+      await dataSource.loadTables(ctx, collections);
+    }
+    if (collections) {
+      delete ctx.action.params.values.collections;
+    }
+  }
+  await next();
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loadDataSourceTablesIntoCollections
+});

package/dist/server/models/data-source.d.ts

@@ -21,6 +21,7 @@ export declare class DataSourceModel extends Model {
         transaction?: Transaction;
         loadAtAfterStart?: boolean;
         refresh?: boolean;
+        reuseDB?: boolean;
     }): Promise<void>;
     private loadLocalData;
 }

package/dist/server/models/data-source.js

@@ -98,7 +98,7 @@ class DataSourceModel extends import_database.Model {
     }
   }
   async loadIntoApplication(options) {
-    const { app, loadAtAfterStart, refresh } = options;
+    const { app, loadAtAfterStart, refresh, reuseDB } = options;
     const dataSourceKey = this.get("key");
     const pluginDataSourceManagerServer = app.pm.get("data-source-manager");
     if (pluginDataSourceManagerServer.dataSourceStatus[dataSourceKey] === "loaded") {
@@ -109,13 +109,16 @@ class DataSourceModel extends import_database.Model {
     const type = this.get("type");
     const createOptions = this.get("options");
     try {
+      const oldDataSource = app.dataSourceManager.get(dataSourceKey);
+      const { db: databaseInstance = void 0 } = reuseDB === true ? (oldDataSource == null ? void 0 : oldDataSource.collectionManager) ?? {} : {};
       const dataSource = app.dataSourceManager.factory.create(type, {
         ...createOptions,
         name: dataSourceKey,
         logger: app.logger.child({ dataSourceKey }),
         sqlLogger: app.sqlLogger.child({ dataSourceKey }),
         cache: app.cache,
-        storagePath: import_path.default.join(process.cwd(), "storage", "cache", "apps", app.name)
+        storagePath: import_path.default.join(process.cwd(), "storage", "cache", "apps", app.name),
+        databaseInstance
       });
       dataSource.on("loadingProgress", (progress) => {
         pluginDataSourceManagerServer.dataSourceLoadingProgress[dataSourceKey] = progress;
@@ -137,7 +140,8 @@ class DataSourceModel extends import_database.Model {
       await this.loadIntoACL({ app, acl, transaction: options.transaction });
       await app.dataSourceManager.add(dataSource, {
         localData: await this.loadLocalData(),
-        refresh
+        refresh,
+        reuseDB
       });
     } catch (e) {
       app.logger.error(`load data source failed`, { cause: e });