fix: make all filter operators uppercase (apache#378)

* fix: make all filter operators uppercase * fix: test case * fix: convertFilter test case
zhaoyongjie · Nov 24, 2021 · 67fea6e · 67fea6e
1 parent 66488d0
commit 67fea6e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...ontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/src/types/Operator.ts b/...ontend/temporary_superset_ui/superset-ui/packages/superset-ui-query/src/types/Operator.ts
@@ -2,10 +2,10 @@
 const UNARY_OPERATORS = ['IS NOT NULL', 'IS NULL'] as const;
 
 /** List of operators that require another operand that is a single value */
-const BINARY_OPERATORS = ['=', '!=', '>', '<', '>=', '<=', 'like', 'regex'] as const;
+const BINARY_OPERATORS = ['=', '!=', '>', '<', '>=', '<=', 'LIKE', 'REGEX'] as const;
 
 /** List of operators that require another operand that is a set */
-const SET_OPERATORS = ['in', 'not in'] as const;
+const SET_OPERATORS = ['IN', 'NOT IN'] as const;
 
 //---------------------------------------------------
 // Derived types

diff --git a/...d/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/convertFilter.test.ts b/...d/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/convertFilter.test.ts
@@ -37,12 +37,12 @@ describe('convertFilter', () => {
         expressionType: 'SIMPLE',
         clause: 'WHERE',
         subject: 'toppings',
-        operator: 'in',
+        operator: 'IN',
         comparator: ['boba', 'grass jelly'],
       }),
     ).toEqual({
       col: 'toppings',
-      op: 'in',
+      op: 'IN',
       val: ['boba', 'grass jelly'],
     });
   });

diff --git a/...nd/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/types/Filter.test.ts b/...nd/temporary_superset_ui/superset-ui/packages/superset-ui-query/test/types/Filter.test.ts
@@ -56,7 +56,7 @@ describe('Filter type guards', () => {
           expressionType: 'SIMPLE',
           clause: 'WHERE',
           subject: 'tea',
-          operator: 'in',
+          operator: 'IN',
           comparator: ['hojicha', 'earl grey'],
         }),
       ).toEqual(true);