pytrilogy 0.0.3.21__tar.gz → 0.0.3.22__tar.gz

{pytrilogy-0.0.3.21/pytrilogy.egg-info → pytrilogy-0.0.3.22}/PKG-INFO

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

{pytrilogy-0.0.3.21 → pytrilogy-0.0.3.22/pytrilogy.egg-info}/PKG-INFO

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

pytrilogy-0.0.3.22/pytrilogy.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+trilogy = trilogy.scripts.trilogy:cli

{pytrilogy-0.0.3.21 → pytrilogy-0.0.3.22}/setup.py

@@ -49,7 +49,7 @@ setuptools.setup(
         "snowflake": ["snowflake-sqlalchemy"],
     },
     entry_points={
-        "console_scripts": ["trilogy=preql.scripts.trilogy:cli"],
+        "console_scripts": ["trilogy=trilogy.scripts.trilogy:cli"],
     },
     classifiers=[
         "Programming Language :: Python",

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

{pytrilogy-0.0.3.21 → pytrilogy-0.0.3.22}/trilogy/core/models/execute.py

@@ -162,7 +162,7 @@ class CTE(BaseModel):
             base += (
                 f"\n-- Nullable: {', '.join([str(x) for x in self.nullable_concepts])}."
             )
-
+        base +='\n'
         return base
 
     def inline_parent_datasource(

{pytrilogy-0.0.3.21 → pytrilogy-0.0.3.22}/trilogy/core/processing/concept_strategies_v3.py

@@ -787,15 +787,17 @@ def _search_concepts(
         )
         # if anything we need to get is in the filter set and it's a computed value
         # we need to get _everything_ in this loop
-        if any(
-            [
-                x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)
+        required_filters = [
+                x 
+                for x in mandatory_list if x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)
+                and not (x.derivation == Derivation.AGGREGATE and x.granularity == Granularity.SINGLE_ROW)
                 and x.address in conditions.row_arguments
-                for x in mandatory_list
             ]
+        if any(
+            required_filters
         ):
             logger.info(
-                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} derived condition row input present in mandatory list, forcing condition evaluation at this level. "
+                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} derived condition row inputs {[x.address for x in required_filters]} present in mandatory list, forcing condition evaluation at this level. "
             )
             mandatory_list = completion_mandatory
             must_evaluate_condition_on_this_level_not_push_down = True

pytrilogy-0.0.3.21/pytrilogy.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-trilogy = preql.scripts.trilogy:cli