fix: update the test

4 months ago · f0751fcf5a
parent 806dadce5c
commit f0751fcf5a
2 changed files with 4 additions and 4 deletions
--- a/server/monitor-types/mssql.js
+++ b/server/monitor-types/mssql.js
@ -27,8 +27,8 @@ class MssqlMonitorType extends MonitorType {
            query = "SELECT 1";
        }

-        const conditions = ConditionExpressionGroup.fromMonitor(monitor);
-        const hasConditions = conditions !== null;
+        const conditions = monitor.conditions ? ConditionExpressionGroup.fromMonitor(monitor) : null;
+        const hasConditions = conditions && conditions.children && conditions.children.length > 0;

        const startTime = dayjs().valueOf();
        try {
--- a/server/monitor-types/mysql.js
+++ b/server/monitor-types/mysql.js
@ -28,8 +28,8 @@ class MysqlMonitorType extends MonitorType {
        // TODO: rename `radius_password` to `password` later for general use
        const password = monitor.radiusPassword;

-        const conditions = ConditionExpressionGroup.fromMonitor(monitor);
-        const hasConditions = conditions !== null;
+        const conditions = monitor.conditions ? ConditionExpressionGroup.fromMonitor(monitor) : null;
+        const hasConditions = conditions && conditions.children && conditions.children.length > 0;

        const startTime = dayjs().valueOf();
        try {