pytrilogy 0.0.2.51__tar.gz → 0.0.2.53__tar.gz

{pytrilogy-0.0.2.51/pytrilogy.egg-info → pytrilogy-0.0.2.53}/PKG-INFO

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

{pytrilogy-0.0.2.51 → pytrilogy-0.0.2.53/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.51 → pytrilogy-0.0.2.53}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.2.51"
+__version__ = "0.0.2.53"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.51 → pytrilogy-0.0.2.53}/trilogy/parsing/render.py

@@ -1,4 +1,5 @@
 from collections import defaultdict
+from datetime import date, datetime
 from functools import singledispatchmethod
 
 from jinja2 import Template
@@ -147,7 +148,7 @@ class Renderer:
         base = f"""datasource {arg.name} (
     {assignments}
     )
-{self.to_string(arg.grain)}{non_partial}
+{self.to_string(arg.grain) if arg.grain.components else ''}{non_partial}
 {self.to_string(arg.address)}"""
 
         if arg.where:
@@ -273,6 +274,14 @@ class Renderer:
     def _(self, arg: DataType):
         return arg.value
 
+    @to_string.register
+    def _(self, arg: date):
+        return f"'{arg.isoformat()}'::date"
+
+    @to_string.register
+    def _(self, arg: datetime):
+        return f"'{arg.isoformat()}'::datetime"
+
     @to_string.register
     def _(self, arg: ConceptDerivation):
         # this is identical rendering;
@@ -408,6 +417,8 @@ class Renderer:
             return " / ".join(args)
         if arg.operator == FunctionType.MOD:
             return f"{args[0]} % {args[1]}"
+        if arg.operator == FunctionType.PARENTHETICAL:
+            return f"({args[0]})"
 
         inputs = ",".join(args)