plugin-data-source-mssql 2.0.1 → 2.0.3

package/dist/externalVersion.js

@@ -8,10 +8,10 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.11",
-  "@nocobase/plugin-data-source-manager": "2.0.11",
-  "@nocobase/server": "2.0.11",
-  "@nocobase/database": "2.0.11",
+  "@nocobase/client": "2.0.15",
+  "@nocobase/plugin-data-source-manager": "2.0.15",
+  "@nocobase/server": "2.0.15",
+  "@nocobase/database": "2.0.15",
   "react": "18.2.0",
   "@formily/react": "2.3.7",
   "antd": "5.24.2",
@@ -19,8 +19,8 @@ module.exports = {
   "@ant-design/icons": "5.6.1",
   "@emotion/css": "11.13.0",
   "react-router-dom": "6.30.1",
-  "@nocobase/actions": "2.0.11",
-  "@nocobase/data-source-manager": "2.0.11",
+  "@nocobase/actions": "2.0.15",
+  "@nocobase/data-source-manager": "2.0.15",
   "sequelize": "6.35.2",
   "lodash": "4.17.21"
 };

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

@@ -181,79 +181,34 @@ class MssqlExternalDataSource extends import_data_source_manager.SequelizeDataSo
   }
   /**
    * Set up MSSQL-specific Sequelize hooks for datetime handling.
-   * MSSQL DATETIME doesn't support timezone offset format like '+00:00'.
+   * MSSQL DATETIME doesn't support timezone offset format like '+00:00',
+   * so we convert Date objects to 'YYYY-MM-DD HH:mm:ss.SSS' on save.
+   *
+   * NOTE: We intentionally do NOT transform dates in WHERE clauses.
+   * The NocoBase core date operators already produce properly formatted strings
+   * (via DatetimeNoTzField → 'YYYY-MM-DD HH:mm:ss') that MSSQL understands
+   * natively. Using Sequelize.literal() for dates in WHERE clauses would:
+   *   1. Bypass parameterized queries → no index usage → full table scans
+   *   2. Add recursive overhead to every single query
    */
   setupMssqlHooks() {
     const db = this.collectionManager.db;
     if (!(db == null ? void 0 : db.sequelize)) return;
-    const Sequelize = db.sequelize.Sequelize;
-    if (!Sequelize) return;
-    db.sequelize.addHook("afterConnect", (connection) => {
-      if (connection && typeof connection.execSql === "function") {
-        try {
-          const { Request } = require("tedious");
-          connection.execSql(new Request("SET NOCOUNT ON", () => {
-          }));
-        } catch {
-        }
-      }
-    });
     const isDatetimeString = (value) => {
       return /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}:\d{2}(\.\d+)?(Z|[+-]\d{2}(:\d{2})?)?$/.test(value);
     };
     db.sequelize.addHook("beforeSave", (instance) => {
-      if (instance && instance.dataValues) {
-        if (!Sequelize) return;
-        for (const [key, value] of Object.entries(instance.dataValues)) {
-          let dateValue = null;
-          if (value instanceof Date) {
-            dateValue = value;
-          } else if (typeof value === "string" && isDatetimeString(value)) {
-            dateValue = new Date(value);
-          }
-          if (dateValue && !isNaN(dateValue.getTime())) {
-            const iso = dateValue.toISOString();
-            const mssqlDate = iso.replace("T", " ").replace("Z", "");
-            if (Sequelize && Sequelize.literal) {
-              instance.dataValues[key] = Sequelize.literal(`'${mssqlDate}'`);
-            }
-          }
+      if (!(instance == null ? void 0 : instance.dataValues)) return;
+      for (const [key, value] of Object.entries(instance.dataValues)) {
+        let dateValue = null;
+        if (value instanceof Date) {
+          dateValue = value;
+        } else if (typeof value === "string" && isDatetimeString(value)) {
+          dateValue = new Date(value);
         }
-      }
-    });
-    const transformDatesInObject = (obj, Sq) => {
-      if (!obj || typeof obj !== "object") return obj;
-      if (obj instanceof Date) {
-        if (!isNaN(obj.getTime())) {
-          const iso = obj.toISOString();
-          const mssqlDate = iso.replace("T", " ").replace("Z", "");
-          return Sq.literal(`'${mssqlDate}'`);
+        if (dateValue && !isNaN(dateValue.getTime())) {
+          instance.dataValues[key] = dateValue.toISOString().replace("T", " ").replace("Z", "");
         }
-        return obj;
-      }
-      if (Array.isArray(obj)) {
-        return obj.map((item) => transformDatesInObject(item, Sq));
-      }
-      const result = {};
-      for (const key of Reflect.ownKeys(obj)) {
-        result[key] = transformDatesInObject(obj[key], Sq);
-      }
-      return result;
-    };
-    db.sequelize.addHook("beforeFind", (options) => {
-      if (!options || !options.where) return;
-      try {
-        options.where = transformDatesInObject(options.where, Sequelize);
-      } catch (err) {
-        console.error("[MSSQL] Error transforming dates in WHERE:", err);
-      }
-    });
-    db.sequelize.addHook("beforeCount", (options) => {
-      if (!options || !options.where) return;
-      try {
-        options.where = transformDatesInObject(options.where, Sequelize);
-      } catch (err) {
-        console.error("[MSSQL] Error transforming dates in WHERE:", err);
       }
     });
   }

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "Data source: MSSQL",
   "displayName.ru-RU": "Источник данных: MSSQL",
   "displayName.zh-CN": "数据源：MSSQL",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "External MSSQL data source support for NocoBase.",
   "license": "MIT",
   "main": "./dist/server/index.js",