Merge pull request #11 from cloudblue/fix_rql_values

fix casting of boolean for comp operators

Author: marcserrat

cnct/rql/base.py

@@ -1,7 +1,4 @@
-from datetime import date, datetime
-from decimal import Decimal
-
-from cnct.rql.utils import parse_kwargs
+from cnct.rql.utils import parse_kwargs, to_rql_value
 
 
 COMP = ('eq', 'ne', 'lt', 'le', 'gt', 'ge')
@@ -225,31 +222,15 @@ def empty(self, value):
 
     def _bin(self, op, value):
         self._field = '.'.join(self._path)
-        actual_value = None
-        if isinstance(value, str):
-            actual_value = value
-        elif isinstance(value, bool):
-            actual_value = 'true' if value else 'false'
-        elif isinstance(value, (int, float, Decimal)):
-            actual_value = str(value)
-        elif isinstance(value, (date, datetime)):
-            actual_value = value.isoformat()
-        else:
-            raise TypeError(f"the `{op}` operator doesn't support the {type(value)} type.")
-
-        self.expr = f'{op}({self._field},{actual_value})'
+        value = to_rql_value(op, value)
+        self.expr = f'{op}({self._field},{value})'
         return self
 
     def _list(self, op, value):
         self._field = '.'.join(self._path)
-        actual_value = None
-        if isinstance(value, (list, tuple)):
-            actual_value = ','.join(value)
-        if actual_value:
-            self.expr = f'{op}({self._field},({actual_value}))'
-            return self
-
-        raise TypeError(f"the `{op}` operator doesn't support the {type(value)} type.")
+        value = to_rql_value(op, value)
+        self.expr = f'{op}({self._field},({value}))'
+        return self
 
     def _bool(self, expr, value):
         self._field = '.'.join(self._path)

cnct/rql/utils.py

@@ -1,3 +1,7 @@
+from datetime import date, datetime
+from decimal import Decimal
+
+
 COMP = ('eq', 'ne', 'lt', 'le', 'gt', 'ge')
 SEARCH = ('like', 'ilike')
 LIST = ('in', 'out')
@@ -14,20 +18,23 @@ def parse_kwargs(query_dict):
         if len(tokens) == 1:
             #  field=value
             field = tokens[0]
+            value = to_rql_value('eq', value)
             query.append(f'eq({field},{value})')
             continue
         op = tokens[-1]
         if op not in KEYWORDS:
             # field__nested=value
             field = '.'.join(tokens)
+            value = to_rql_value('eq', value)
             query.append(f'eq({field},{value})')
             continue
         field = '.'.join(tokens[:-1])
         if op in COMP or op in SEARCH:
+            value = to_rql_value(op, value)
             query.append(f'{op}({field},{value})')
             continue
         if op in LIST:
-            value = ','.join(value)
+            value = to_rql_value(op, value)
             query.append(f'{op}({field},({value}))')
             continue
 
@@ -36,3 +43,18 @@ def parse_kwargs(query_dict):
         query.append(f'{cmpop}({field},{expr})')
 
     return query
+
+
+def to_rql_value(op, value):
+    if op not in LIST:
+        if isinstance(value, str):
+            return value
+        if isinstance(value, bool):
+            return 'true' if value else 'false'
+        if isinstance(value, (int, float, Decimal)):
+            return str(value)
+        if isinstance(value, (date, datetime)):
+            return value.isoformat()
+    if op in LIST and isinstance(value, (list, tuple)):
+        return ','.join(value)
+    raise TypeError(f"the `{op}` operator doesn't support the {type(value)} type.")

tests/rql/test_base.py

@@ -22,16 +22,19 @@ def test_create_single_kwarg():
 
 
 def test_create_multiple_kwargs():
-    q = RQLQuery(id='ID', status__in=('a', 'b'))
+    q = RQLQuery(id='ID', status__in=('a', 'b'), ok=True)
     assert q.op == RQLQuery.AND
-    assert str(q) == 'and(eq(id,ID),in(status,(a,b)))'
-    assert len(q.children) == 2
+    assert str(q) == 'and(eq(id,ID),in(status,(a,b)),eq(ok,true))'
+    assert len(q.children) == 3
     assert q.children[0].op == RQLQuery.EXPR
     assert q.children[0].children == []
     assert str(q.children[0]) == 'eq(id,ID)'
     assert q.children[1].op == RQLQuery.EXPR
     assert q.children[1].children == []
     assert str(q.children[1]) == 'in(status,(a,b))'
+    assert q.children[2].op == RQLQuery.EXPR
+    assert q.children[2].children == []
+    assert str(q.children[2]) == 'eq(ok,true)'
 
 
 def test_len():