pytrilogy 0.0.2.29__py3-none-any.whl → 0.0.2.31__py3-none-any.whl

{pytrilogy-0.0.2.29.dist-info → pytrilogy-0.0.2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.29
+Version: 0.0.2.31
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.2.29.dist-info → pytrilogy-0.0.2.31.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=0Y9rVM2nobxcrfYQcGTfJVv_-3fbl5QtzNRClHX50TU,291
+trilogy/__init__.py,sha256=VblpsLULNBnUhw05evBTHbgeqv65Ler6brQxBYz86lM,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=KiyYnctoZen4Hzv8WG2jeN-IE-dfQbWHdVCUeTZYjBg,1270
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -70,14 +70,14 @@ trilogy/parsing/common.py,sha256=t7yiL_3f6rz_rouF9et84v5orAgs-EprV4V9ghQ6ql4,100
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=JwG98fotPpvh5VC-CcHknCTFid9-Zj1Wfo8CyPOnJzs,64431
-trilogy/parsing/render.py,sha256=B9J2GrYQcE76kddMQSeAmvAPX-9pv39mpeSHZ10SNj8,14655
+trilogy/parsing/parse_engine.py,sha256=goN7oQqvSjU3Vqm4lXs4bNVAoHEMT-JkL_o_fhYy9vo,64591
+trilogy/parsing/render.py,sha256=VKyo8wEOuiOzUtJ6w9EoGGmkhlqDQyy8wFj_Q_h6EfE,15263
 trilogy/parsing/trilogy.lark,sha256=_z5px2N-e8oLUf7SpPMXXNqbAykDkZOvP4_lPgf5-Uk,12245
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.29.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.29.dist-info/METADATA,sha256=_grlNHrTsokAIFDU4uIYFOrJ8t7X_R5vr0kcuNMzJ6g,8403
-pytrilogy-0.0.2.29.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pytrilogy-0.0.2.29.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.29.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.29.dist-info/RECORD,,
+pytrilogy-0.0.2.31.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.31.dist-info/METADATA,sha256=ouEJ1harU8vFjegOhfJuIsAfDrwyyhA8Tb1rbQiH4lU,8403
+pytrilogy-0.0.2.31.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pytrilogy-0.0.2.31.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.31.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.31.dist-info/RECORD,,

trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.29"
+__version__ = "0.0.2.31"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/parsing/parse_engine.py

@@ -162,6 +162,21 @@ def parse_concept_reference(
     return lookup, namespace, name, parent
 
 
+def expr_to_boolean(
+    root,
+) -> Union[Comparison, Conditional, SubselectComparison, Parenthetical]:
+    if not isinstance(root, (Comparison, Conditional, Parenthetical)):
+        if arg_to_datatype(root) == DataType.BOOL:
+            root = Comparison(left=root, right=True, operator=ComparisonOperator.EQ)
+        else:
+            root = Comparison(
+                left=root,
+                right=MagicConstants.NULL,
+                operator=ComparisonOperator.IS_NOT,
+            )
+    return root
+
+
 def unwrap_transformation(
     input: Union[
         FilterItem,
@@ -1022,15 +1037,7 @@ class ParseToObjects(Transformer):
 
     def where(self, args):
         root = args[0]
-        if not isinstance(root, (Comparison, Conditional, Parenthetical)):
-            if arg_to_datatype(root) == DataType.BOOL:
-                root = Comparison(left=root, right=True, operator=ComparisonOperator.EQ)
-            else:
-                root = Comparison(
-                    left=root,
-                    right=MagicConstants.NULL,
-                    operator=ComparisonOperator.IS_NOT,
-                )
+        root = expr_to_boolean(root)
         return WhereClause(conditional=root)
 
     def having(self, args):
@@ -1838,7 +1845,8 @@ class ParseToObjects(Transformer):
     @v_args(meta=True)
     def fcase_when(self, meta, args) -> CaseWhen:
         args = process_function_args(args, meta=meta, environment=self.environment)
-        return CaseWhen(comparison=args[0], expr=args[1])
+        root = expr_to_boolean(args[0])
+        return CaseWhen(comparison=root, expr=args[1])
 
     @v_args(meta=True)
     def fcase_else(self, meta, args) -> CaseElse:

trilogy/parsing/render.py

@@ -386,13 +386,31 @@ class Renderer:
 
     @to_string.register
     def _(self, arg: "Function"):
-        inputs = ",".join(self.to_string(c) for c in arg.arguments)
+        args = [self.to_string(c) for c in arg.arguments]
+
+        if arg.operator == FunctionType.SUBTRACT:
+            return f"{args[0]} - {args[1]}"
+        if arg.operator == FunctionType.ADD:
+            return f"{args[0]} + {args[1]}"
+        if arg.operator == FunctionType.MULTIPLY:
+            return f"{args[0]} * {args[1]}"
+        if arg.operator == FunctionType.DIVIDE:
+            return f"{args[0]} / {args[1]}"
+        if arg.operator == FunctionType.MOD:
+            return f"{args[0]} % {args[1]}"
+
+        inputs = ",".join(args)
+
         if arg.operator == FunctionType.CONSTANT:
             return f"{inputs}"
         if arg.operator == FunctionType.CAST:
             return f"CAST({self.to_string(arg.arguments[0])} AS {self.to_string(arg.arguments[1])})"
         if arg.operator == FunctionType.INDEX_ACCESS:
             return f"{self.to_string(arg.arguments[0])}[{self.to_string(arg.arguments[1])}]"
+
+        if arg.operator == FunctionType.CASE:
+            inputs = "\n".join(args)
+            return f"CASE {inputs}\nEND"
         return f"{arg.operator.value}({inputs})"
 
     @to_string.register