dbgate-sqltree 6.6.0 → 6.6.2

package/lib/evaluateCondition.js

@@ -78,6 +78,13 @@ function evaluateCondition(condition, values) {
                 });
                 return evaluateCondition(replaced, values);
             });
+        case 'in':
+            const value = extractRawValue((0, evaluateExpression_1.evaluateExpression)(condition.expr, values));
+            const list = condition.values;
+            if (Array.isArray(list)) {
+                return list.some(item => item == value);
+            }
+            return false;
     }
 }
 exports.evaluateCondition = evaluateCondition;

package/lib/utility.d.ts

@@ -9,3 +9,6 @@ export declare function selectKeysFromTable(options: {
     keyColumns: [];
     loadKeys: any[][];
 }): Select;
+export declare function createLogCompoudCondition(fieldFilters: {
+    [field: string]: string[];
+}, timeColumn: string, timeFrom: number, timeTo: number): Condition;

package/lib/utility.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectKeysFromTable = exports.mergeConditions = exports.scriptToSql = exports.treeToSql = void 0;
+exports.createLogCompoudCondition = exports.selectKeysFromTable = exports.mergeConditions = exports.scriptToSql = exports.treeToSql = void 0;
 const dumpSqlCommand_1 = require("./dumpSqlCommand");
 function treeToSql(driver, object, func) {
     const dmp = driver.createDumper();
@@ -81,3 +81,38 @@ function selectKeysFromTable(options) {
     return res;
 }
 exports.selectKeysFromTable = selectKeysFromTable;
+function createLogCompoudCondition(fieldFilters, timeColumn, timeFrom, timeTo) {
+    const conditions = [
+        {
+            conditionType: 'binary',
+            operator: '>=',
+            left: { exprType: 'column', columnName: timeColumn },
+            right: { exprType: 'value', value: timeFrom },
+        },
+        {
+            conditionType: 'binary',
+            operator: '<=',
+            left: { exprType: 'column', columnName: timeColumn },
+            right: { exprType: 'value', value: timeTo },
+        },
+    ];
+    for (const [key, values] of Object.entries(fieldFilters)) {
+        if (values.length == 1 && values[0] == null) {
+            conditions.push({
+                conditionType: 'isNull',
+                expr: { exprType: 'column', columnName: key },
+            });
+            continue;
+        }
+        conditions.push({
+            conditionType: 'in',
+            expr: { exprType: 'column', columnName: key },
+            values,
+        });
+    }
+    return {
+        conditionType: 'and',
+        conditions,
+    };
+}
+exports.createLogCompoudCondition = createLogCompoudCondition;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.6.0",
+  "version": "6.6.2",
   "name": "dbgate-sqltree",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,7 +27,7 @@
   ],
   "devDependencies": {
     "@types/node": "^13.7.0",
-    "dbgate-types": "^6.6.0",
+    "dbgate-types": "^6.6.2",
     "typescript": "^4.4.3"
   },
   "dependencies": {