pytrilogy 0.0.2.5__tar.gz → 0.0.2.6__tar.gz

{pytrilogy-0.0.2.5/pytrilogy.egg-info → pytrilogy-0.0.2.6}/PKG-INFO

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

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/tests/test_parsing.py

@@ -160,7 +160,8 @@ address `preqldata.analytics_411641820.events_*`
 ;"""
     )
     query = parsed[-1]
-    assert query.address.location == "`preqldata.analytics_411641820.events_*`"
+    assert query.address.quoted is True
+    assert query.address.location == "preqldata.analytics_411641820.events_*"
 
 
 def test_purpose_and_keys():
@@ -448,3 +449,46 @@ select
         {"a": 1, "b": 2, "c": 3},
         1,
     )
+
+
+def test_datasource_colon():
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+x:x,
+y:y)
+grain(x)
+address `abc:def`
+;
+
+
+select x;
+"""
+    env, parsed = parse_text(text)
+
+    results = Dialects.DUCK_DB.default_executor().generate_sql(text)[0]
+
+    assert '"abc:def" as test' in results
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+x:x,
+y:y)
+grain(x)
+address abcdef
+;
+
+
+select x;
+"""
+    env, parsed = parse_text(text)
+
+    results = Dialects.DUCK_DB.default_executor().generate_sql(text)[0]
+
+    assert "abcdef as test" in results, results

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/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.5"
+__version__ = "0.0.2.6"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/trilogy/core/enums.py

@@ -7,6 +7,7 @@ class UnnestMode(Enum):
     DIRECT = "direct"
     CROSS_APPLY = "cross_apply"
     CROSS_JOIN = "cross_join"
+    CROSS_JOIN_ALIAS = "cross_join_alias"
 
 
 class ConceptSource(Enum):

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/trilogy/core/models.py

@@ -1817,6 +1817,7 @@ class MultiSelectStatement(SelectTypeMixin, Mergeable, Namespaced, BaseModel):
 class Address(BaseModel):
     location: str
     is_query: bool = False
+    quoted: bool = False
 
 
 class Query(BaseModel):
@@ -2579,6 +2580,16 @@ class CTE(BaseModel):
             return self.relevant_base_ctes[0].name
         return self.source.name
 
+    @property
+    def quote_address(self) -> bool:
+        if self.is_root_datasource:
+            candidate = self.source.datasources[0]
+            if isinstance(candidate, Datasource) and isinstance(
+                candidate.address, Address
+            ):
+                return candidate.address.quoted
+        return False
+
     @property
     def base_alias(self) -> str:
         if self.base_alias_override:

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/trilogy/dialect/base.py

@@ -499,10 +499,12 @@ class BaseDialect:
                 for c in cte.output_columns
                 if c.address not in [y.address for y in cte.hidden_concepts]
             ]
-        if cte.base_name == cte.base_alias:
-            source = cte.base_name
+        if cte.quote_address:
+            source = f"{self.QUOTE_CHARACTER}{cte.base_name}{self.QUOTE_CHARACTER}"
         else:
-            source = f"{cte.base_name} as {cte.base_alias}"
+            source = cte.base_name
+        if cte.base_name != cte.base_alias:
+            source = f"{source} as {cte.base_alias}"
         return CompiledCTE(
             name=cte.name,
             statement=self.SQL_TEMPLATE.render(

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/trilogy/dialect/common.py

@@ -26,7 +26,8 @@ def render_join(
             raise ValueError("must provide a cte to build an unnest joins")
         if unnest_mode == UnnestMode.CROSS_JOIN:
             return f"CROSS JOIN {render_func(join.concept, cte, False)} as {quote_character}{join.concept.safe_address}{quote_character}"
-
+        if unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
+            return f"CROSS JOIN {render_func(join.concept, cte, False)} as array_unnest ({quote_character}{join.concept.safe_address}{quote_character})"
         return f"FULL JOIN {render_func(join.concept, cte, False)} as unnest_wrapper({quote_character}{join.concept.safe_address}{quote_character})"
     left_name = join.left_name
     right_name = join.right_name

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/trilogy/dialect/presto.py

@@ -5,7 +5,7 @@ from jinja2 import Template
 from trilogy.core.enums import FunctionType, WindowType
 from trilogy.dialect.base import BaseDialect
 from trilogy.core.models import DataType
-
+from trilogy.core.enums import UnnestMode
 
 WINDOW_FUNCTION_MAP: Mapping[WindowType, Callable[[Any, Any, Any], str]] = {}
 
@@ -86,6 +86,7 @@ class PrestoDialect(BaseDialect):
     QUOTE_CHARACTER = '"'
     SQL_TEMPLATE = SQL_TEMPLATE
     DATATYPE_MAP = {**BaseDialect.DATATYPE_MAP, DataType.NUMERIC: "DECIMAL"}
+    UNNEST_MODE = UnnestMode.CROSS_JOIN
 
 
 class TrinoDialect(PrestoDialect):

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/trilogy/parsing/parse_engine.py

@@ -297,8 +297,11 @@ class ParseToObjects(Transformer):
     def concept_lit(self, args) -> Concept:
         return self.environment.concepts.__getitem__(args[0])
 
-    def ADDRESS(self, args) -> str:
-        return args.value
+    def ADDRESS(self, args) -> Address:
+        return Address(location=args.value, quoted=False)
+
+    def QUOTED_ADDRESS(self, args) -> Address:
+        return Address(location=args.value[1:-1], quoted=True)
 
     def STRING_CHARS(self, args) -> str:
         return args.value
@@ -1010,7 +1013,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def address(self, meta: Meta, args):
-        return Address(location=args[0])
+        return args[0]
 
     @v_args(meta=True)
     def query(self, meta: Meta, args):

{pytrilogy-0.0.2.5 → pytrilogy-0.0.2.6}/trilogy/parsing/trilogy.lark

@@ -39,7 +39,7 @@
     
     grain_clause: "grain" "(" column_list ")"
     
-    address: "address" ADDRESS
+    address: "address" (QUOTED_ADDRESS | ADDRESS)
     
     query: "query" MULTILINE_STRING
     
@@ -258,7 +258,8 @@
     // base language constructs
     concept_lit: IDENTIFIER
     IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\-\.\-]*/
-    ADDRESS: IDENTIFIER | /`[a-zA-Z\_][a-zA-Z0-9\_\-\.\-\*]*`/
+    QUOTED_ADDRESS:  /`[a-zA-Z\_][a-zA-Z0-9\_\-\.\-\*\:]*`/
+    ADDRESS: IDENTIFIER
 
     MULTILINE_STRING: /\'{3}(.*?)\'{3}/s