pytrilogy 0.0.1.114__tar.gz → 0.0.1.115__tar.gz

{pytrilogy-0.0.1.114/pytrilogy.egg-info → pytrilogy-0.0.1.115}/PKG-INFO

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

{pytrilogy-0.0.1.114 → pytrilogy-0.0.1.115/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.1.114 → pytrilogy-0.0.1.115}/tests/test_parsing.py

@@ -263,3 +263,32 @@ def test_the_comments():
     assert isinstance(right, MagicConstants), type(right)
     rendered = BaseDialect().render_expr(right)
     assert rendered == "null"
+
+
+def test_purpose_nesting():
+
+    env, parsed = parse_text(
+        """key year int;
+"""
+    )
+
+    env2: Environment = Environment()
+    env2.add_import("dates", env)
+
+    env2, _ = parse_text(
+        """
+property <dates.year>.generation <-
+CASE WHEN dates.year BETWEEN 1883 AND 1900 THEN 'Lost Generation'
+        WHEN dates.year BETWEEN 1901 AND 1927 THEN 'The Greatest Generation'
+        WHEN dates.year BETWEEN 1928 AND 1945 THEN 'The Silent Generation'
+        WHEN dates.year BETWEEN 1946 AND 1964 THEN 'Baby Boomer'
+        WHEN dates.year BETWEEN 1965 AND 1980 THEN 'Generation X'
+        WHEN dates.year BETWEEN 1981 AND 1996 THEN 'Millennials'
+        WHEN dates.year BETWEEN 1997 AND 2012 THEN 'Generation Z'
+        ELSE 'Unknown'
+    END;
+    """,
+        env2,
+    )
+
+    assert env2.concepts["dates.generation"].purpose == Purpose.PROPERTY

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

{pytrilogy-0.0.1.114 → pytrilogy-0.0.1.115}/trilogy/core/models.py

@@ -2669,7 +2669,8 @@ class Environment(BaseModel):
 
 
 class LazyEnvironment(Environment):
-    """Variant of environment to defer parsing of a path"""
+    """Variant of environment to defer parsing of a path
+    until relevant attributes accessed."""
 
     load_path: Path
     loaded: bool = False
@@ -2681,6 +2682,7 @@ class LazyEnvironment(Environment):
             "working_path",
             "model_config",
             "model_fields",
+            "model_post_init",
         ) or name.startswith("_"):
             return super().__getattribute__(name)
         if not self.loaded:

{pytrilogy-0.0.1.114 → pytrilogy-0.0.1.115}/trilogy/parsing/parse_engine.py

@@ -465,16 +465,19 @@ class ParseToObjects(Transformer):
         if purpose == Purpose.AUTO:
             purpose = None
         raw_name = args[1]
+        # abc.def.property pattern
         if isinstance(raw_name, str):
             lookup, namespace, name, parent_concept = parse_concept_reference(
                 raw_name, self.environment, purpose
             )
+        # <abc.def,zef.gf>.property pattern
         else:
             keys, name = raw_name
-            if "." in name:
-                namespace, name = name.rsplit(".", 1)
-            else:
+            namespaces = set([x.namespace for x in keys])
+            if not len(namespaces) == 1:
                 namespace = self.environment.namespace or DEFAULT_NAMESPACE
+            else:
+                namespace = namespaces.pop()
         source_value = args[2]
         # we need to strip off every parenthetical to see what is being assigned.
         while isinstance(source_value, Parenthetical):