pytrilogy 0.0.3.21__py3-none-any.whl → 0.0.3.23__py3-none-any.whl

{pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.23.dist-info}/METADATA

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

{pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.23.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.21.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=n0fAEm3rOxsyfVJboGyrvMZZfBz-GUzKvCTTS1z9qwE,303
+pytrilogy-0.0.3.23.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=V3stjtkh3sDxf-s4ccwlCSOIsq8WO5pyE5PuQVwEsio,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -23,19 +23,19 @@ trilogy/core/optimization.py,sha256=xGO8piVsLrpqrx-Aid_Y56_5slSv4eZmlP64hCHRiEc,
 trilogy/core/query_processor.py,sha256=Do8YpdPBdsbKtl9n37hobzk8SORMGqH-e_zNNxd-BE4,19456
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/models/author.py,sha256=gsn_vkm8gvnwTvzgqOL5v3X1Lx4n8xg32tRwk_9Mxnc,73494
-trilogy/core/models/build.py,sha256=bO1qYvuGl6LeNGgsfS6ZHAzZBR2lBPLg-QJymp9hgkU,57235
+trilogy/core/models/build.py,sha256=T3rDPoWNO_pNice90WBVwPzyiHK4pg-i-5iClkWeY8s,57392
 trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g69eqGvz03YX0,5528
 trilogy/core/models/core.py,sha256=nb4h1HHm5_qwmUkYth4zRhEttS1EtsMZCP4vT20EEAE,10326
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
 trilogy/core/models/environment.py,sha256=RlHNrRer4p1uSQM030iwGJL82M1hMyY5p8a550XTfUI,26606
-trilogy/core/models/execute.py,sha256=4jbfwRt6Qv0kNzVU8b_z10Ln0Nk-CDvnbMEP1gCAbck,34204
+trilogy/core/models/execute.py,sha256=KZHiovlSr_3ZjyzKD1mdBlAqnPCqFCChQkO4_4WlGtg,34224
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
 trilogy/core/optimizations/inline_constant.py,sha256=lvNTIXaLNkw3HseJyXyDNk5R52doLU9sIg3pmU2_S08,1332
 trilogy/core/optimizations/inline_datasource.py,sha256=AHuTGh2x0GQ8usOe0NiFncfTFQ_KogdgDl4uucmhIbI,4241
 trilogy/core/optimizations/predicate_pushdown.py,sha256=g4AYE8Aw_iMlAh68TjNXGP754NTurrDduFECkUjoBnc,9399
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=yZAAyrdLBhArAX87SWAqTB0E3DRt0I5XuQ3or2FHyas,40302
+trilogy/core/processing/concept_strategies_v3.py,sha256=O-O08cGLl4XX3Faf59UlkFjsjzTU-QkzlDQ0mzY-LRE,40515
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
 trilogy/core/processing/utility.py,sha256=Oc5tLGeDDpzhbfo2ZcF8ex1kez-NcJDMcG2Lm5BjS4c,20548
 trilogy/core/processing/node_generators/__init__.py,sha256=o8rOFHPSo-s_59hREwXMW6gjUJCsiXumdbJNozHUf-Y,800
@@ -91,13 +91,13 @@ trilogy/parsing/common.py,sha256=99tDKrpQTk-SpyTXUqKFtm-lfmhjCOQIn25hxbQvRRg,214
 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=UiTrjU6Lpp25S-wly_pNS0wUYEsZpjHExxduArtE1vQ,60602
+trilogy/parsing/parse_engine.py,sha256=Jja7SxpD0QSVdDfhaGs7QN301tt6g0npc3fAGhsuVuI,60787
 trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,17837
 trilogy/parsing/trilogy.lark,sha256=7libFS5HNiyHJYzr5_lEiY-Lpqit04_PgyIPHMZT7-w,12928
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
-pytrilogy-0.0.3.21.dist-info/METADATA,sha256=JgrwJO6p9VrP93Ccj8XjYglOZ6VfWKD3DtuXENQxGT0,9100
-pytrilogy-0.0.3.21.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
-pytrilogy-0.0.3.21.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.3.21.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.21.dist-info/RECORD,,
+pytrilogy-0.0.3.23.dist-info/METADATA,sha256=ZlYR5KCt_WOZwxuAmV6P5iFW88GmieXKo48iTCHmG9c,9100
+pytrilogy-0.0.3.23.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pytrilogy-0.0.3.23.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.23.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.23.dist-info/RECORD,,

{pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.23.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.1)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pytrilogy-0.0.3.23.dist-info/entry_points.txt

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

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.23"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models/build.py

@@ -1721,6 +1721,10 @@ class Factory:
             components=base.components, where_clause=where
         )
 
+    @build.register
+    def _(self, base: TupleWrapper) -> TupleWrapper:
+        return TupleWrapper(val=[self.build(x) for x in base.val], type=base.type)
+
     @build.register
     def _(self, base: FilterItem) -> BuildFilterItem:
         return BuildFilterItem.model_construct(

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(

trilogy/core/processing/concept_strategies_v3.py

@@ -787,15 +787,19 @@ 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)
-                and x.address in conditions.row_arguments
-                for x in mandatory_list
-            ]
-        ):
+        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
+        ]
+        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

trilogy/parsing/parse_engine.py

@@ -1342,7 +1342,10 @@ class ParseToObjects(Transformer):
         )
 
     def expr_tuple(self, args):
-        return TupleWrapper(content=tuple(args))
+        datatypes = set([arg_to_datatype(x) for x in args])
+        if len(datatypes) != 1:
+            raise ParseError("Tuple must have same type for all elements")
+        return TupleWrapper(val=tuple(args), type=datatypes.pop())
 
     def parenthetical(self, args):
         return Parenthetical(content=args[0])

pytrilogy-0.0.3.21.dist-info/entry_points.txt

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