pytrilogy 0.0.3.74__tar.gz → 0.0.3.75__tar.gz

{pytrilogy-0.0.3.74/pytrilogy.egg-info → pytrilogy-0.0.3.75}/PKG-INFO

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

{pytrilogy-0.0.3.74 → pytrilogy-0.0.3.75/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.74 → pytrilogy-0.0.3.75}/tests/test_parsing.py

@@ -524,6 +524,26 @@ address abcdef
 ;
 
 
+select x;
+"""
+    env, parsed = parse_text(text)
+
+    results = Dialects.DUCK_DB.default_executor().generate_sql(text)[0]
+
+    assert '"abcdef" as "test"' in results, results
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+x,
+y)
+grain(x)
+address abcdef
+;
+
+
 select x;
 """
     env, parsed = parse_text(text)

{pytrilogy-0.0.3.74 → pytrilogy-0.0.3.75}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.74"
+__version__ = "0.0.3.75"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.74 → pytrilogy-0.0.3.75}/trilogy/parsing/parse_engine.py

@@ -524,8 +524,12 @@ class ParseToObjects(Transformer):
     @v_args(meta=True)
     def column_assignment(self, meta: Meta, args):
         modifiers = []
-        alias = args[0]
-        concept_list = args[1]
+        if len(args) == 2:
+            alias = args[0]
+            concept_list = args[1]
+        else:
+            alias = args[0][-1]
+            concept_list = args[0]
         # recursively collect modifiers
         if len(concept_list) > 1:
             modifiers += concept_list[:-1]

{pytrilogy-0.0.3.74 → pytrilogy-0.0.3.75}/trilogy/parsing/trilogy.lark

@@ -51,7 +51,7 @@
     
     //column_assignment
     //figure out if we want static
-    column_assignment: (raw_column_assignment | IDENTIFIER | QUOTED_IDENTIFIER |  expr  ) ":" concept_assignment
+    column_assignment: ((raw_column_assignment | IDENTIFIER | QUOTED_IDENTIFIER |  expr  ) ":" concept_assignment) | concept_assignment
     
     RAW_ENTRY.1: /raw\s*\(/s