@nocobase/plugin-collection-sql 2.3.0-beta.7 → 2.3.0-beta.9

package/dist/externalVersion.js

@@ -8,20 +8,20 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.3.0-beta.7",
+  "@nocobase/client": "2.3.0-beta.9",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/client-v2": "2.3.0-beta.7",
-  "@nocobase/flow-engine": "2.3.0-beta.7",
-  "@nocobase/plugin-data-source-manager": "2.3.0-beta.7",
+  "@nocobase/client-v2": "2.3.0-beta.9",
+  "@nocobase/flow-engine": "2.3.0-beta.9",
+  "@nocobase/plugin-data-source-manager": "2.3.0-beta.9",
   "ahooks": "3.7.8",
   "antd": "5.24.2",
   "dayjs": "1.11.13",
   "lodash": "4.18.1",
   "react": "18.2.0",
-  "@nocobase/data-source-manager": "2.3.0-beta.7",
-  "@nocobase/database": "2.3.0-beta.7",
-  "@nocobase/server": "2.3.0-beta.7",
-  "@nocobase/actions": "2.3.0-beta.7",
+  "@nocobase/data-source-manager": "2.3.0-beta.9",
+  "@nocobase/database": "2.3.0-beta.9",
+  "@nocobase/server": "2.3.0-beta.9",
+  "@nocobase/actions": "2.3.0-beta.9",
   "sequelize": "6.35.2",
-  "@nocobase/utils": "2.3.0-beta.7"
+  "@nocobase/utils": "2.3.0-beta.9"
 };

package/dist/server/sql-collection/sql-collection.js

@@ -73,7 +73,8 @@ class SQLCollection extends import_database.Collection {
     if (!autoGenId) {
       model.removeAttribute("id");
     }
-    model.sql = (sql == null ? void 0 : sql.endsWith(";")) ? sql.slice(0, -1) : sql;
+    const normalizedSQL = sql == null ? void 0 : sql.trim();
+    model.sql = (normalizedSQL == null ? void 0 : normalizedSQL.endsWith(";")) ? normalizedSQL.slice(0, -1) : normalizedSQL;
     model.database = this.context.database;
     model.collection = this;
     this.model = new Proxy(model, {

package/dist/server/utils.js

@@ -32,24 +32,10 @@ module.exports = __toCommonJS(utils_exports);
 const checkSQL = (sql) => {
   const dangerKeywords = [
     // PostgreSQL
-    "pg_read_file",
-    "pg_read_binary_file",
-    "pg_stat_file",
-    "pg_ls_dir",
-    "pg_logdir_ls",
-    "pg_terminate_backend",
-    "pg_cancel_backend",
+    "pg_",
     "current_setting",
     "set_config",
-    "pg_reload_conf",
-    "pg_sleep",
     "generate_series",
-    "pg_catalog",
-    "pg_shadow",
-    "pg_authid",
-    "pg_auth_members",
-    "pg_roles",
-    "pg_stat_activity",
     "information_schema",
     // MySQL
     "LOAD_FILE",
@@ -60,7 +46,13 @@ const checkSQL = (sql) => {
     "sqlite3_load_extension",
     "load_extension"
   ];
-  sql = sql.trim().split(";").shift() || "";
+  sql = sql.trim();
+  if (sql.endsWith(";")) {
+    sql = sql.slice(0, -1);
+  }
+  if (sql.includes(";")) {
+    throw new Error("Only supports SELECT statements or WITH clauses");
+  }
   if (!/^select/i.test(sql) && !/^with([\s\S]+)select([\s\S]+)/i.test(sql)) {
     throw new Error("Only supports SELECT statements or WITH clauses");
   }

package/package.json

@@ -6,7 +6,7 @@
   "description": "Provides SQL collection template",
   "description.ru-RU": "Предоставляет шаблон коллекции на основе SQL",
   "description.zh-CN": "提供 SQL 数据表模板",
-  "version": "2.3.0-beta.7",
+  "version": "2.3.0-beta.9",
   "homepage": "https://docs-cn.nocobase.com/handbook/collection-sql",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/collection-sql",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/collection-sql",
@@ -23,5 +23,5 @@
   "keywords": [
     "Collections"
   ],
-  "gitHead": "3485d95ce53290d6e74d68222a0568ea60420e23"
+  "gitHead": "c215e60ed704afe6c086bd96304f4b0d3b46d02e"
 }