dbgate-sqltree 6.4.1 → 6.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/evaluateCondition.js +11 -5
- package/package.json +2 -2
package/lib/evaluateCondition.js
CHANGED
|
@@ -21,11 +21,18 @@ function isLike(value, test) {
|
|
|
21
21
|
const res = !!value.toString().match(regex);
|
|
22
22
|
return res;
|
|
23
23
|
}
|
|
24
|
+
function extractRawValue(value) {
|
|
25
|
+
if (value === null || value === void 0 ? void 0 : value.$bigint)
|
|
26
|
+
return value.$bigint;
|
|
27
|
+
if (value === null || value === void 0 ? void 0 : value.$oid)
|
|
28
|
+
return value.$oid;
|
|
29
|
+
return value;
|
|
30
|
+
}
|
|
24
31
|
function evaluateCondition(condition, values) {
|
|
25
32
|
switch (condition.conditionType) {
|
|
26
33
|
case 'binary':
|
|
27
|
-
const left = (0, evaluateExpression_1.evaluateExpression)(condition.left, values);
|
|
28
|
-
const right = (0, evaluateExpression_1.evaluateExpression)(condition.right, values);
|
|
34
|
+
const left = extractRawValue((0, evaluateExpression_1.evaluateExpression)(condition.left, values));
|
|
35
|
+
const right = extractRawValue((0, evaluateExpression_1.evaluateExpression)(condition.right, values));
|
|
29
36
|
switch (condition.operator) {
|
|
30
37
|
case '=':
|
|
31
38
|
return left == right;
|
|
@@ -55,10 +62,9 @@ function evaluateCondition(condition, values) {
|
|
|
55
62
|
case 'or':
|
|
56
63
|
return condition.conditions.some(cond => evaluateCondition(cond, values));
|
|
57
64
|
case 'like':
|
|
58
|
-
return isLike((0, evaluateExpression_1.evaluateExpression)(condition.left, values), (0, evaluateExpression_1.evaluateExpression)(condition.right, values));
|
|
59
|
-
break;
|
|
65
|
+
return isLike(extractRawValue((0, evaluateExpression_1.evaluateExpression)(condition.left, values)), extractRawValue((0, evaluateExpression_1.evaluateExpression)(condition.right, values)));
|
|
60
66
|
case 'notLike':
|
|
61
|
-
return !isLike((0, evaluateExpression_1.evaluateExpression)(condition.left, values), (0, evaluateExpression_1.evaluateExpression)(condition.right, values));
|
|
67
|
+
return !isLike(extractRawValue((0, evaluateExpression_1.evaluateExpression)(condition.left, values)), extractRawValue((0, evaluateExpression_1.evaluateExpression)(condition.right, values)));
|
|
62
68
|
case 'not':
|
|
63
69
|
return !evaluateCondition(condition.condition, values);
|
|
64
70
|
case 'anyColumnPass':
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "6.4.
|
|
2
|
+
"version": "6.4.2",
|
|
3
3
|
"name": "dbgate-sqltree",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"typings": "lib/index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
],
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@types/node": "^13.7.0",
|
|
30
|
-
"dbgate-types": "^6.4.
|
|
30
|
+
"dbgate-types": "^6.4.2",
|
|
31
31
|
"typescript": "^4.4.3"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|