pytrilogy 0.0.3.72__tar.gz → 0.0.3.73__tar.gz

{pytrilogy-0.0.3.72/pytrilogy.egg-info → pytrilogy-0.0.3.73}/PKG-INFO

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

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/constants.py

@@ -37,7 +37,7 @@ class Comments:
     show: bool = False
     basic: bool = True
     joins: bool = True
-    nullable: bool = False
+    nullable: bool = True
     partial: bool = True
 
 

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/core/models/execute.py

@@ -501,7 +501,6 @@ class BaseJoin(BaseModel):
                 f"Cannot join a dataself to itself, joining {self.left_datasource} and"
                 f" {self.right_datasource}"
             )
-
         # Early returns maintained as in original code
         if self.concept_pairs or self.concepts == []:
             return self

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/core/processing/node_generators/window_node.py

@@ -69,6 +69,8 @@ def gen_window_node(
     # append in keys to get the right grain
     if concept.keys:
         for item in concept.keys:
+            if item in targets:
+                continue
             logger.info(
                 f"{padding(depth)}{LOGGER_PREFIX} appending search for key {item}"
             )

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/core/processing/utility.py

@@ -13,6 +13,7 @@ from trilogy.core.enums import (
     FunctionClass,
     Granularity,
     JoinType,
+    Modifier,
     Purpose,
 )
 from trilogy.core.models.build import (
@@ -355,6 +356,20 @@ def reduce_concept_pairs(input: list[ConceptPair]) -> list[ConceptPair]:
     return final
 
 
+def get_modifiers(
+    concept: str,
+    join: JoinOrderOutput,
+    ds_node_map: dict[str, QueryDatasource | BuildDatasource],
+):
+    base = []
+
+    if join.right and concept in ds_node_map[join.right].nullable_concepts:
+        base.append(Modifier.NULLABLE)
+    if join.left and concept in ds_node_map[join.left].nullable_concepts:
+        base.append(Modifier.NULLABLE)
+    return list(set(base))
+
+
 def get_node_joins(
     datasources: List[QueryDatasource | BuildDatasource],
     environment: BuildEnvironment,
@@ -400,6 +415,9 @@ def get_node_joins(
                             concept_map[concept], ds_node_map[j.right]
                         ),
                         existing_datasource=ds_node_map[k],
+                        modifiers=get_modifiers(
+                            concept_map[concept].address, j, ds_node_map
+                        ),
                     )
                     for k, v in j.keys.items()
                     for concept in v

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/dialect/bigquery.py

@@ -43,7 +43,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: "1",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/dialect/common.py

@@ -20,6 +20,7 @@ from trilogy.core.models.execute import (
 
 
 def null_wrapper(lval: str, rval: str, modifiers: list[Modifier]) -> str:
+
     if Modifier.NULLABLE in modifiers:
         return f"({lval} = {rval} or ({lval} is null and {rval} is null))"
     return f"{lval} = {rval}"

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/dialect/postgres.py

@@ -37,7 +37,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: f"{args[0]}",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/dialect/presto.py

@@ -39,7 +39,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: f"{args[0]}",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/dialect/snowflake.py

@@ -36,7 +36,8 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: f"{args[0]}",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.72 → pytrilogy-0.0.3.73}/trilogy/dialect/sql_server.py

@@ -31,7 +31,8 @@ FUNCTION_MAP = {
 # we may return a static value
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: "1",
+    FunctionType.COUNT_DISTINCT: lambda args: f"CASE WHEN{args[0]} IS NOT NULL THEN 1 ELSE 0 END",
+    FunctionType.COUNT: lambda args: f"CASE WHEN {args[0]} IS NOT NULL THEN 1 ELSE 0 END",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }