pytrilogy 0.0.1.117__tar.gz → 0.0.1.118__tar.gz

{pytrilogy-0.0.1.117/pytrilogy.egg-info → pytrilogy-0.0.1.118}/PKG-INFO

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

{pytrilogy-0.0.1.117 → pytrilogy-0.0.1.118/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.1.117 → pytrilogy-0.0.1.118}/trilogy/core/functions.py

@@ -52,12 +52,22 @@ def argument_to_purpose(arg) -> Purpose:
     if isinstance(arg, Function):
         return arg.output_purpose
     elif isinstance(arg, AggregateWrapper):
+        base = arg.function.output_purpose
+        if arg.by and base == Purpose.METRIC:
+            return Purpose.PROPERTY
         return arg.function.output_purpose
     elif isinstance(arg, Parenthetical):
         return argument_to_purpose(arg.content)
     elif isinstance(arg, WindowItem):
         return Purpose.PROPERTY
     elif isinstance(arg, Concept):
+        base = arg.purpose
+        if (
+            isinstance(arg.lineage, AggregateWrapper)
+            and arg.lineage.by
+            and base == Purpose.METRIC
+        ):
+            return Purpose.PROPERTY
         return arg.purpose
     elif isinstance(arg, (int, float, str, bool, list, NumericType, DataType)):
         return Purpose.CONSTANT

{pytrilogy-0.0.1.117 → pytrilogy-0.0.1.118}/trilogy/core/models.py

@@ -149,6 +149,11 @@ class SelectGrain(ABC):
         raise NotImplementedError
 
 
+class ConstantInlineable(ABC):
+    def inline_concept(self, concept: Concept):
+        raise NotImplementedError
+
+
 class DataType(Enum):
     # PRIMITIVES
     STRING = "string"
@@ -2075,6 +2080,9 @@ class CTE(BaseModel):
         if concept.address in self.source_map:
             removed = removed.union(self.source_map[concept.address])
             del self.source_map[concept.address]
+
+        if self.condition:
+            self.condition = self.condition.inline_constant(concept)
         # if we've entirely removed the need to join to someplace to get the concept
         # drop the join as well.
         for removed_cte in removed:
@@ -2763,7 +2771,7 @@ class LazyEnvironment(Environment):
         return super().__getattribute__(name)
 
 
-class Comparison(ConceptArgs, Namespaced, SelectGrain, BaseModel):
+class Comparison(ConceptArgs, Namespaced, ConstantInlineable, SelectGrain, BaseModel):
     left: Union[
         int,
         str,
@@ -2825,6 +2833,32 @@ class Comparison(ConceptArgs, Namespaced, SelectGrain, BaseModel):
     def __str__(self):
         return self.__repr__()
 
+    def inline_constant(self, constant: Concept) -> "Comparison":
+        assert isinstance(constant.lineage, Function)
+        new_val = constant.lineage.arguments[0]
+        if isinstance(self.left, ConstantInlineable):
+            new_left = self.left.inline_constant(constant)
+        elif self.left == constant:
+            new_left = new_val
+        else:
+            new_left = self.left
+
+        if isinstance(self.right, ConstantInlineable):
+            new_right = self.right.inline_constant(constant)
+        elif self.right == constant:
+            new_right = new_val
+        else:
+            new_right = self.right
+
+        if self.right == constant:
+            new_right = new_val
+
+        return Comparison(
+            left=new_left,
+            right=new_right,
+            operator=self.operator,
+        )
+
     def with_namespace(self, namespace: str):
         return self.__class__(
             left=(
@@ -3001,7 +3035,7 @@ class CaseElse(Namespaced, SelectGrain, BaseModel):
         )
 
 
-class Conditional(ConceptArgs, Namespaced, SelectGrain, BaseModel):
+class Conditional(ConceptArgs, Namespaced, ConstantInlineable, SelectGrain, BaseModel):
     left: Union[
         int,
         str,
@@ -3047,6 +3081,32 @@ class Conditional(ConceptArgs, Namespaced, SelectGrain, BaseModel):
     def __repr__(self):
         return f"{str(self.left)} {self.operator.value} {str(self.right)}"
 
+    def inline_constant(self, constant: Concept) -> "Conditional":
+        assert isinstance(constant.lineage, Function)
+        new_val = constant.lineage.arguments[0]
+        if isinstance(self.left, ConstantInlineable):
+            new_left = self.left.inline_constant(constant)
+        elif self.left == constant:
+            new_left = new_val
+        else:
+            new_left = self.left
+
+        if isinstance(self.right, ConstantInlineable):
+            new_right = self.right.inline_constant(constant)
+        elif self.right == constant:
+            new_right = new_val
+        else:
+            new_right = self.right
+
+        if self.right == constant:
+            new_right = new_val
+
+        return Conditional(
+            left=new_left,
+            right=new_right,
+            operator=self.operator,
+        )
+
     def with_namespace(self, namespace: str):
         return Conditional(
             left=(
@@ -3386,7 +3446,9 @@ class RowsetItem(Namespaced, BaseModel):
         return [self.content]
 
 
-class Parenthetical(ConceptArgs, Namespaced, SelectGrain, BaseModel):
+class Parenthetical(
+    ConceptArgs, Namespaced, ConstantInlineable, SelectGrain, BaseModel
+):
     content: "Expr"
 
     def __str__(self):
@@ -3420,6 +3482,15 @@ class Parenthetical(ConceptArgs, Namespaced, SelectGrain, BaseModel):
             )
         )
 
+    def inline_constant(self, concept: Concept):
+        return Parenthetical(
+            content=(
+                self.content.inline_constant(concept)
+                if isinstance(self.content, ConstantInlineable)
+                else self.content
+            )
+        )
+
     @property
     def concept_arguments(self) -> List[Concept]:
         base: List[Concept] = []

{pytrilogy-0.0.1.117 → pytrilogy-0.0.1.118}/trilogy/executor.py

@@ -16,6 +16,8 @@ from trilogy.core.models import (
     PersistStatement,
     ShowStatement,
     Concept,
+    ConceptDeclarationStatement,
+    Datasource,
 )
 from trilogy.dialect.base import BaseDialect
 from trilogy.dialect.enums import Dialects
@@ -100,6 +102,33 @@ class Executor(object):
     def execute_query(self, query) -> CursorResult:
         raise NotImplementedError("Cannot execute type {}".format(type(query)))
 
+    @execute_query.register
+    def _(self, query: ConceptDeclarationStatement) -> CursorResult:
+        concept = query.concept
+        return MockResult(
+            [
+                {
+                    "address": concept.address,
+                    "type": concept.datatype.value,
+                    "purpose": concept.purpose.value,
+                    "derivation": concept.derivation.value,
+                }
+            ],
+            ["address", "type", "purpose", "derivation"],
+        )
+
+    @execute_query.register
+    def _(self, query: Datasource) -> CursorResult:
+
+        return MockResult(
+            [
+                {
+                    "name": query.name,
+                }
+            ],
+            ["name"],
+        )
+
     @execute_query.register
     def _(self, query: SelectStatement) -> CursorResult:
         sql = self.generator.generate_queries(