pytrilogy 0.0.2.7__py3-none-any.whl → 0.0.2.9__py3-none-any.whl

trilogy/dialect/common.py

@@ -9,6 +9,18 @@ def null_wrapper(lval: str, rval: str, concept: Concept) -> str:
     return f"{lval} = {rval}"
 
 
+def render_unnest(
+    unnest_mode: UnnestMode,
+    quote_character: str,
+    concept: Concept,
+    render_func: Callable[[Concept, CTE, bool], str],
+    cte: CTE,
+):
+    if unnest_mode == UnnestMode.CROSS_JOIN:
+        return f"{render_func(concept, cte, False)} as {quote_character}{concept.safe_address}{quote_character}"
+    return f"{render_func(concept, cte, False)} as unnest_wrapper ({quote_character}{concept.safe_address}{quote_character})"
+
+
 def render_join(
     join: Join | InstantiatedUnnestJoin,
     quote_character: str,
@@ -25,10 +37,10 @@ def render_join(
         if not cte:
             raise ValueError("must provide a cte to build an unnest joins")
         if unnest_mode == UnnestMode.CROSS_JOIN:
-            return f"CROSS JOIN {render_func(join.concept, cte, False)} as {quote_character}{join.concept.safe_address}{quote_character}"
+            return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.concept, render_func, cte)}"
         if unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
-            return f"CROSS JOIN {render_func(join.concept, cte, False)} as array_unnest ({quote_character}{join.concept.safe_address}{quote_character})"
-        return f"FULL JOIN {render_func(join.concept, cte, False)} as unnest_wrapper({quote_character}{join.concept.safe_address}{quote_character})"
+            return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.concept, render_func, cte)}"
+        return f"FULL JOIN {render_unnest(unnest_mode, quote_character, join.concept, render_func, cte)}"
     left_name = join.left_name
     right_name = join.right_name
     right_base = join.right_ref

trilogy/dialect/presto.py

@@ -33,6 +33,7 @@ FUNCTION_MAP = {
     FunctionType.DATE_ADD: lambda x: f"DATE_ADD('{x[1]}', {x[2]}, {x[0]})",
     FunctionType.CURRENT_DATE: lambda x: "CURRENT_DATE",
     FunctionType.CURRENT_DATETIME: lambda x: "CURRENT_TIMESTAMP",
+    FunctionType.ARRAY: lambda x: f"ARRAY[{', '.join(x)}]",
 }
 
 FUNCTION_GRAIN_MATCH_MAP = {
@@ -86,7 +87,7 @@ class PrestoDialect(BaseDialect):
     QUOTE_CHARACTER = '"'
     SQL_TEMPLATE = SQL_TEMPLATE
     DATATYPE_MAP = {**BaseDialect.DATATYPE_MAP, DataType.NUMERIC: "DECIMAL"}
-    UNNEST_MODE = UnnestMode.CROSS_JOIN
+    UNNEST_MODE = UnnestMode.CROSS_JOIN_ALIAS
 
 
 class TrinoDialect(PrestoDialect):

trilogy/parsing/parse_engine.py

@@ -108,6 +108,7 @@ from trilogy.core.models import (
     list_to_wrapper,
     dict_to_map_wrapper,
     NumericType,
+    HavingClause,
 )
 from trilogy.parsing.exceptions import ParseError
 from trilogy.utility import string_to_hash
@@ -960,6 +961,7 @@ class ParseToObjects(Transformer):
         limit = None
         order_by = None
         where = None
+        having = None
         for arg in args:
             if isinstance(arg, List):
                 select_items = arg
@@ -967,13 +969,16 @@ class ParseToObjects(Transformer):
                 limit = arg.count
             elif isinstance(arg, OrderBy):
                 order_by = arg
-            elif isinstance(arg, WhereClause):
+            elif isinstance(arg, WhereClause) and not isinstance(arg, HavingClause):
                 where = arg
+            elif isinstance(arg, HavingClause):
+                having = arg
         if not select_items:
             raise ValueError("Malformed select, missing select items")
         output = SelectStatement(
             selection=select_items,
             where_clause=where,
+            having_clause=having,
             limit=limit,
             order_by=order_by,
             meta=Metadata(line_number=meta.line),
@@ -991,6 +996,7 @@ class ParseToObjects(Transformer):
                         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
@@ -1032,6 +1038,19 @@ class ParseToObjects(Transformer):
                 )
         return WhereClause(conditional=root)
 
+    def having(self, args):
+        root = args[0]
+        if not isinstance(root, (Comparison, Conditional, Parenthetical)):
+            if arg_to_datatype(root) == DataType.BOOL:
+                root = Comparison(left=root, right=True, operator=ComparisonOperator.EQ)
+            else:
+                root = Comparison(
+                    left=root,
+                    right=MagicConstants.NULL,
+                    operator=ComparisonOperator.IS_NOT,
+                )
+        return HavingClause(conditional=root)
+
     @v_args(meta=True)
     def function_binding_list(self, meta: Meta, args) -> Concept:
         return args

trilogy/parsing/trilogy.lark

@@ -61,7 +61,7 @@
     persist_statement: "persist"i IDENTIFIER "into"i IDENTIFIER "from"i select_statement grain_clause?
 
     // select statement
-    select_statement: "select"i select_list  where?  order_by?  limit? 
+    select_statement: where? "select"i select_list where?  having?  order_by?  limit? 
 
     // multiple_selects
     multi_select_statement: select_statement ("merge" select_statement)+ "align"i align_clause  where? order_by?  limit? 
@@ -134,6 +134,8 @@
     
     where: "WHERE"i conditional
     
+    having: "HAVING"i conditional
+
     !array_comparison: ( ("NOT"i "IN"i) | "IN"i)
 
     COMPARISON_OPERATOR: (/is[\s]+not/ | "is" |"=" | ">" | "<" | ">=" | "<=" | "!=")