pytrilogy 0.0.2.31__py3-none-any.whl → 0.0.2.32__py3-none-any.whl

{pytrilogy-0.0.2.31.dist-info → pytrilogy-0.0.2.32.dist-info}/METADATA

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

{pytrilogy-0.0.2.31.dist-info → pytrilogy-0.0.2.32.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=VblpsLULNBnUhw05evBTHbgeqv65Ler6brQxBYz86lM,291
+trilogy/__init__.py,sha256=CPOHf23-XKufDWmGAC9X5pKiKQAepzaB-rNzkGplJNo,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=KiyYnctoZen4Hzv8WG2jeN-IE-dfQbWHdVCUeTZYjBg,1270
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -50,9 +50,9 @@ trilogy/core/processing/nodes/select_node_v2.py,sha256=7WoFxeGEAzhpS4y4Zw2nH2tt7
 trilogy/core/processing/nodes/unnest_node.py,sha256=mAmFluzm2yeeiQ6NfIB7BU_8atRGh-UJfPf9ROwbhr8,2152
 trilogy/core/processing/nodes/window_node.py,sha256=ro0QfMFi4ZmIn5Q4D0M_vJWfnHH_C0MN7XkVkx8Gygg,1214
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=VqBnDwPRzJkb1HPIlZ2X4lLsZzYrgJIOqr8x0UQuESg,34226
+trilogy/dialect/base.py,sha256=V3YSzuyom8PLRS5Qru4iGatlB0huNLKorPKsYoAVWLk,34308
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
-trilogy/dialect/common.py,sha256=Pm9naWL5eo-BfZTYFMWhX9lpsGuxEyvvn_EuXbFeos0,3817
+trilogy/dialect/common.py,sha256=eqJi_Si1iyb2sV0siTf8g8JOHueWu6RkdtQZtutKazk,3826
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
 trilogy/dialect/duckdb.py,sha256=_0a5HBU8zRNtZj7YED3ju4fHXRYG9jNeKwnlZwUDvwI,3419
 trilogy/dialect/enums.py,sha256=4NdpsydBpDn6jnh0JzFz5VvQEtnShErWtWHVyT6TNpw,3948
@@ -70,14 +70,14 @@ trilogy/parsing/common.py,sha256=t7yiL_3f6rz_rouF9et84v5orAgs-EprV4V9ghQ6ql4,100
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=goN7oQqvSjU3Vqm4lXs4bNVAoHEMT-JkL_o_fhYy9vo,64591
+trilogy/parsing/parse_engine.py,sha256=eCEJJ06zgWhj4DNja5CEhlwv-PrGlVMXDHUX9Q3aITM,64688
 trilogy/parsing/render.py,sha256=VKyo8wEOuiOzUtJ6w9EoGGmkhlqDQyy8wFj_Q_h6EfE,15263
-trilogy/parsing/trilogy.lark,sha256=_z5px2N-e8oLUf7SpPMXXNqbAykDkZOvP4_lPgf5-Uk,12245
+trilogy/parsing/trilogy.lark,sha256=Tuqw5oGMwOYt3TYOEx_hZqGpsAp-PiAKiMW8S3EFRcg,12236
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.31.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.31.dist-info/METADATA,sha256=ouEJ1harU8vFjegOhfJuIsAfDrwyyhA8Tb1rbQiH4lU,8403
-pytrilogy-0.0.2.31.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pytrilogy-0.0.2.31.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.31.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.31.dist-info/RECORD,,
+pytrilogy-0.0.2.32.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.32.dist-info/METADATA,sha256=iOdK_We6Z-kEQP6SnEzowkN089iEjUCqq_Q7yGxLEkQ,8403
+pytrilogy-0.0.2.32.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pytrilogy-0.0.2.32.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.32.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.32.dist-info/RECORD,,

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.31"
+__version__ = "0.0.2.32"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

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

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}"

trilogy/parsing/parse_engine.py

@@ -164,8 +164,8 @@ def parse_concept_reference(
 
 def expr_to_boolean(
     root,
-) -> Union[Comparison, Conditional, SubselectComparison, Parenthetical]:
-    if not isinstance(root, (Comparison, Conditional, Parenthetical)):
+) -> 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:
@@ -1098,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]))

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