pytrilogy 0.0.2.34__tar.gz → 0.0.2.35__tar.gz

{pytrilogy-0.0.2.34/pytrilogy.egg-info → pytrilogy-0.0.2.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.34
+Version: 0.0.2.35
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -20,6 +20,7 @@ Requires-Dist: networkx
 Requires-Dist: pyodbc
 Requires-Dist: pydantic
 Requires-Dist: duckdb-engine
+Requires-Dist: click
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == "postgres"
 Provides-Extra: bigquery

{pytrilogy-0.0.2.34 → pytrilogy-0.0.2.35/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.34
+Version: 0.0.2.35
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -20,6 +20,7 @@ Requires-Dist: networkx
 Requires-Dist: pyodbc
 Requires-Dist: pydantic
 Requires-Dist: duckdb-engine
+Requires-Dist: click
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == "postgres"
 Provides-Extra: bigquery

{pytrilogy-0.0.2.34 → pytrilogy-0.0.2.35}/pytrilogy.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ tests/test_datatypes.py
 tests/test_declarations.py
 tests/test_derived_concepts.py
 tests/test_discovery_nodes.py
+tests/test_enums.py
 tests/test_environment.py
 tests/test_executor.py
 tests/test_functions.py

{pytrilogy-0.0.2.34 → pytrilogy-0.0.2.35}/pytrilogy.egg-info/requires.txt

@@ -5,6 +5,7 @@ networkx
 pyodbc
 pydantic
 duckdb-engine
+click
 
 [bigquery]
 sqlalchemy-bigquery

pytrilogy-0.0.2.35/tests/test_enums.py

@@ -0,0 +1,12 @@
+from trilogy.core.enums import BooleanOperator, Boolean
+
+
+def test_boolean_operator():
+    assert BooleanOperator("AND") == BooleanOperator.AND
+    assert BooleanOperator("and") == BooleanOperator.AND
+
+
+def test_boolean():
+    assert Boolean("TRUE") == Boolean.TRUE
+    assert Boolean("true") == Boolean.TRUE
+    assert Boolean(True) == Boolean.TRUE

{pytrilogy-0.0.2.34 → pytrilogy-0.0.2.35}/tests/test_select.py

@@ -128,3 +128,22 @@ def test_modifiers():
     text = generator.compile_statement(query)
     assert "2 = 2" in text
     assert "as `b`" not in text
+
+
+def test_having_without_select():
+    q1 = """
+    const a <- 1;
+    const b <- 2;
+    
+    select
+        a,
+
+    having b =2
+    ;"""
+    failed = False
+    try:
+        env, parsed = parse(q1)
+    except Exception as e:
+        assert "that is not in the select projection in the HAVING clause" in str(e)
+        failed = True
+    assert failed

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

{pytrilogy-0.0.2.34 → pytrilogy-0.0.2.35}/trilogy/core/enums.py

@@ -215,11 +215,28 @@ class Boolean(Enum):
     TRUE = "true"
     FALSE = "false"
 
+    @classmethod
+    def _missing_(cls, value):
+        if value is True:
+            return Boolean.TRUE
+        elif value is False:
+            return Boolean.FALSE
+        strval = str(value)
+        if strval.lower() != strval:
+            return Boolean(strval.lower())
+
 
 class BooleanOperator(Enum):
     AND = "and"
     OR = "or"
 
+    @classmethod
+    def _missing_(cls, value):
+        strval = str(value)
+        if strval.lower() != strval:
+            return BooleanOperator(strval.lower())
+        return None
+
 
 class ComparisonOperator(Enum):
     LT = "<"

{pytrilogy-0.0.2.34 → pytrilogy-0.0.2.35}/trilogy/core/models.py

@@ -1629,6 +1629,45 @@ class SelectStatement(HasUUID, Mergeable, Namespaced, SelectTypeMixin, BaseModel
                     self.grain
                 )
 
+    def validate_syntax(self):
+        all_in_output = [x.address for x in self.output_components]
+        if self.where_clause:
+            for concept in self.where_clause.concept_arguments:
+
+                if (
+                    concept.lineage
+                    and isinstance(concept.lineage, Function)
+                    and concept.lineage.operator
+                    in FunctionClass.AGGREGATE_FUNCTIONS.value
+                ):
+                    if concept.address in self.locally_derived:
+                        raise SyntaxError(
+                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {self.meta.line_number}"
+                        )
+
+                if (
+                    concept.lineage
+                    and isinstance(concept.lineage, AggregateWrapper)
+                    and concept.lineage.function.operator
+                    in FunctionClass.AGGREGATE_FUNCTIONS.value
+                ):
+                    if concept.address in self.locally_derived:
+                        raise SyntaxError(
+                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {self.meta.line_number}"
+                        )
+        if self.having_clause:
+            for concept in self.having_clause.concept_arguments:
+                if concept.address not in [x.address for x in self.output_components]:
+                    raise SyntaxError(
+                        f"Cannot reference a column ({concept.address}) that is not in the select projection in the HAVING clause, move to WHERE;  Line: {self.meta.line_number}"
+                    )
+        if self.order_by:
+            for concept in self.order_by.concept_arguments:
+                if concept.address not in all_in_output:
+                    raise SyntaxError(
+                        f"Cannot order by a column that is not in the output projection; {self.meta.line_number}"
+                    )
+
     def __str__(self):
         from trilogy.parsing.render import render_query
 

{pytrilogy-0.0.2.34 → pytrilogy-0.0.2.35}/trilogy/parsing/parse_engine.py

@@ -30,7 +30,6 @@ from trilogy.core.enums import (
     WindowType,
     DatePart,
     ShowCategory,
-    FunctionClass,
     IOType,
     ConceptSource,
 )
@@ -264,7 +263,6 @@ class ParseToObjects(Transformer):
         for k, v in self.parsed.items():
             if v.pass_count == 2:
                 continue
-            print(f"Hydrating {k}")
             v.hydrate_missing()
         self.environment.concepts.fail_on_missing = True
         reparsed = self.transform(self.tokens[self.token_address])
@@ -988,8 +986,6 @@ class ParseToObjects(Transformer):
             order_by=order_by,
             meta=Metadata(line_number=meta.line),
         )
-        locally_derived: set[str] = set()
-        all_in_output: set[str] = set()
         for item in select_items:
             # we don't know the grain of an aggregate at assignment time
             # so rebuild at this point in the tree
@@ -998,25 +994,16 @@ class ParseToObjects(Transformer):
                 new_concept = item.content.output.with_select_context(
                     output.grain,
                     conditional=None,
-                    # conditional=(
-                    #     output.where_clause.conditional
-                    #     if output.where_clause
-                    #     and output.where_clause_category == SelectFiltering.IMPLICIT
-                    #     else None
-                    # ),
                     environment=self.environment,
                 )
                 self.environment.add_concept(new_concept, meta=meta)
                 item.content.output = new_concept
-                locally_derived.add(new_concept.address)
-                all_in_output.add(new_concept.address)
             elif isinstance(item.content, Concept):
                 # Sometimes cached values here don't have the latest info
                 # but we can't just use environment, as it might not have the right grain.
                 item.content = self.environment.concepts[
                     item.content.address
                 ].with_grain(item.content.grain)
-                all_in_output.add(item.content.address)
         if order_by:
             for orderitem in order_by.items:
                 if isinstance(orderitem.expr, Concept):
@@ -1024,52 +1011,9 @@ class ParseToObjects(Transformer):
                         orderitem.expr = orderitem.expr.with_select_context(
                             output.grain,
                             conditional=None,
-                            # conditional=(
-                            #     output.where_clause.conditional
-                            #     if output.where_clause
-                            #     and output.where_clause_category
-                            #     == SelectFiltering.IMPLICIT
-                            #     else None
-                            # ),
                             environment=self.environment,
                         )
-        if output.where_clause:
-            for concept in output.where_clause.concept_arguments:
-
-                if (
-                    concept.lineage
-                    and isinstance(concept.lineage, Function)
-                    and concept.lineage.operator
-                    in FunctionClass.AGGREGATE_FUNCTIONS.value
-                ):
-                    if concept.address in locally_derived:
-                        raise SyntaxError(
-                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {meta.line}"
-                        )
-
-                if (
-                    concept.lineage
-                    and isinstance(concept.lineage, AggregateWrapper)
-                    and concept.lineage.function.operator
-                    in FunctionClass.AGGREGATE_FUNCTIONS.value
-                ):
-                    if concept.address in locally_derived:
-                        raise SyntaxError(
-                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {meta.line}"
-                        )
-        if output.having_clause:
-            for concept in output.having_clause.concept_arguments:
-                if concept.address not in all_in_output:
-                    raise SyntaxError(
-                        f"Cannot reference a column ({concept.address}) that is not in the select projection in the HAVING clause, move to WHERE;  Line: {meta.line}"
-                    )
-        if output.order_by:
-            for concept in output.order_by.concept_arguments:
-                if concept.address not in all_in_output:
-                    raise SyntaxError(
-                        f"Cannot order by a column that is not in the output projection; {meta.line}"
-                    )
-
+        output.validate_syntax()
         return output
 
     @v_args(meta=True)