pytrilogy 0.0.2.30__tar.gz → 0.0.2.32__tar.gz

{pytrilogy-0.0.2.30/pytrilogy.egg-info → pytrilogy-0.0.2.32}/PKG-INFO

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

{pytrilogy-0.0.2.30 → pytrilogy-0.0.2.32/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.30 → pytrilogy-0.0.2.32}/tests/test_functions.py

@@ -212,6 +212,27 @@ def test_case_function(test_environment):
         assert test_environment.concepts["test_upper_case"].datatype == DataType.BOOL
 
 
+def test_case_like_function(test_environment):
+    declarations = """
+    property test_like <- CASE WHEN category_name like '%abc%' then True else False END;
+    select
+        category_name,
+        test_like
+    ;"""
+    env, parsed = parse(declarations, environment=test_environment)
+    assert (
+        test_environment.concepts["category_name"]
+        in test_environment.concepts["test_like"].lineage.concept_arguments
+    )
+    select: SelectStatement = parsed[-1]
+    for dialect in TEST_DIALECTS:
+        compiled = dialect.compile_statement(process_query(test_environment, select))
+        assert "CASE" in compiled
+        assert "ELSE" in compiled
+        assert "END" in compiled
+        assert test_environment.concepts["test_like"].datatype == DataType.BOOL
+
+
 def test_split_and_index_function(test_environment):
     declarations = """
     constant test_string <- 'abc_def';

{pytrilogy-0.0.2.30 → pytrilogy-0.0.2.32}/tests/test_parsing.py

@@ -422,6 +422,17 @@ select
     assert env.concepts["labels"].datatype.value_type == DataType.INTEGER
 
 
+def test_empty_string():
+    env, parsed = parse_text(
+        """
+const labels <- '';
+
+
+"""
+    )
+    assert env.concepts["labels"].datatype == DataType.STRING
+
+
 def test_struct_attr_access():
 
     text = """

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

{pytrilogy-0.0.2.30 → pytrilogy-0.0.2.32}/trilogy/dialect/base.py

@@ -646,12 +646,14 @@ class BaseDialect:
                     else None
                 ),
                 group_by=(
-                    list(
-                        set(
-                            [
-                                self.render_concept_sql(c, cte, alias=False)
-                                for c in cte.group_concepts
-                            ]
+                    sorted(
+                        list(
+                            set(
+                                [
+                                    self.render_concept_sql(c, cte, alias=False)
+                                    for c in cte.group_concepts
+                                ]
+                            )
                         )
                     )
                     if cte.group_to_grain

{pytrilogy-0.0.2.30 → pytrilogy-0.0.2.32}/trilogy/dialect/common.py

@@ -101,5 +101,6 @@ def render_join(
         )
     if not base_joinkeys:
         base_joinkeys = ["1=1"]
-    joinkeys = " AND ".join(base_joinkeys)
+
+    joinkeys = " AND ".join(sorted(base_joinkeys))
     return f"{join.jointype.value.upper()} JOIN {right_base} on {joinkeys}"

{pytrilogy-0.0.2.30 → pytrilogy-0.0.2.32}/trilogy/parsing/parse_engine.py

@@ -162,6 +162,21 @@ def parse_concept_reference(
     return lookup, namespace, name, parent
 
 
+def expr_to_boolean(
+    root,
+) -> Union[Comparison, SubselectComparison, Conditional]:
+    if not isinstance(root, (Comparison, SubselectComparison, Conditional)):
+        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 root
+
+
 def unwrap_transformation(
     input: Union[
         FilterItem,
@@ -1022,15 +1037,7 @@ class ParseToObjects(Transformer):
 
     def where(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,
-                )
+        root = expr_to_boolean(root)
         return WhereClause(conditional=root)
 
     def having(self, args):
@@ -1091,6 +1098,11 @@ class ParseToObjects(Transformer):
     def tuple_lit(self, args):
         return tuple_to_wrapper(args)
 
+    def string_lit(self, args) -> str:
+        if not args:
+            return ""
+        return args[0]
+
     def struct_lit(self, args):
 
         zipped = dict(zip(args[::2], args[1::2]))
@@ -1838,7 +1850,8 @@ class ParseToObjects(Transformer):
     @v_args(meta=True)
     def fcase_when(self, meta, args) -> CaseWhen:
         args = process_function_args(args, meta=meta, environment=self.environment)
-        return CaseWhen(comparison=args[0], expr=args[1])
+        root = expr_to_boolean(args[0])
+        return CaseWhen(comparison=root, expr=args[1])
 
     @v_args(meta=True)
     def fcase_else(self, meta, args) -> CaseElse:

{pytrilogy-0.0.2.30 → pytrilogy-0.0.2.32}/trilogy/parsing/trilogy.lark

@@ -84,7 +84,7 @@
 
     COPY_TYPE: "csv"i
 
-    copy_statement: "copy"i "into"i COPY_TYPE _string_lit "from"i select_statement
+    copy_statement: "copy"i "into"i COPY_TYPE string_lit "from"i select_statement
 
     // FUNCTION blocks
     function: raw_function
@@ -118,7 +118,7 @@
     _assignment: ("->") | "as"i
     select_transform : expr _assignment IDENTIFIER metadata?
     
-    metadata: "metadata" "(" IDENTIFIER "=" _string_lit ")"
+    metadata: "metadata" "(" IDENTIFIER "=" string_lit ")"
     
     limit: "LIMIT"i /[0-9]+/
     
@@ -169,8 +169,8 @@
     unnest: _UNNEST expr ")"
     //indexing into an expression is a function
     index_access: expr "[" int_lit "]"
-    map_key_access: expr "[" _string_lit "]"
-    attr_access: expr  "." _string_lit 
+    map_key_access: expr "[" string_lit "]"
+    attr_access: expr  "." string_lit 
 
     expr:  _constant_functions | window_item | filter_item | subselect_comparison | between_comparison |  fgroup |  aggregate_functions | unnest | _static_functions |  literal |  concept_lit  | index_access |  map_key_access | attr_access | parenthetical | expr_tuple | comparison |  alt_like 
     
@@ -209,16 +209,16 @@
     
     //string
     _LIKE.1: "like("i
-    like:  _LIKE expr "," _string_lit ")"
+    like:  _LIKE expr "," string_lit ")"
     _ILIKE.1: "ilike("i
-    ilike:   _ILIKE expr "," _string_lit ")"
+    ilike:   _ILIKE expr "," string_lit ")"
     alt_like: expr  "like"i expr
     _UPPER.1: "upper("i
     upper: _UPPER expr ")"
    _LOWER.1: "lower("i
     lower: _LOWER expr ")"  
     _SPLIT.1: "split("i  
-    fsplit: _SPLIT expr "," _string_lit ")"
+    fsplit: _SPLIT expr "," string_lit ")"
    _STRPOS.1: "strpos("i
     fstrpos: _STRPOS expr "," expr ")"
     _SUBSTRING.1: "substring("i
@@ -301,7 +301,7 @@
     SINGLE_STRING_CHARS: /(?:(?!\${)([^'\\]|\\.))+/+ // any character except '
     _single_quote: "'" ( SINGLE_STRING_CHARS )* "'" 
     _double_quote: "\"" ( DOUBLE_STRING_CHARS )* "\"" 
-    _string_lit: _single_quote | _double_quote
+    string_lit: _single_quote | _double_quote
 
     MINUS: "-"
 
@@ -322,7 +322,7 @@
 
     !null_lit.1: "null"i
     
-    literal: null_lit | _string_lit | int_lit | float_lit | bool_lit | array_lit | map_lit | struct_lit | tuple_lit
+    literal: null_lit | string_lit | int_lit | float_lit | bool_lit | array_lit | map_lit | struct_lit | tuple_lit
 
     MODIFIER: "Optional"i | "Partial"i | "Nullable"i