pytrilogy 0.0.2.35__tar.gz → 0.0.2.36__tar.gz

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

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

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

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

pytrilogy-0.0.2.36/tests/test_executor.py

@@ -0,0 +1,27 @@
+from trilogy import Dialects, parse, Environment
+from pathlib import Path
+
+
+def test_file_parsing():
+    target = Path(__file__).parent / "test_env.preql"
+    parsed = Dialects.DUCK_DB.default_executor().parse_file(target)
+    assert len(list(parsed)) == 1
+
+
+def test_can_handle_everything():
+    env = Environment(working_path=Path(__file__).parent)
+    env, queries = parse(
+        """
+import test_env as test_env;
+
+key x int;
+
+merge test_env.id into x;
+                         
+RAW_SQL('''select 1 ''');
+""",
+        environment=env,
+    )
+    execs = Dialects.DUCK_DB.default_executor(environment=env)
+    for q in queries:
+        execs.execute_query(q)

{pytrilogy-0.0.2.35 → pytrilogy-0.0.2.36}/tests/test_parsing.py

@@ -523,6 +523,28 @@ address `abc:def`
     assert ds.non_partial_for.conditional.right == 10
 
 
+def test_datasource_quoted():
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+`x 2`:x,
+`y`:~y)
+grain(x)
+complete where y > 10
+address `abc:def`
+;
+
+
+"""
+    env, parsed = parse_text(text)
+
+    ds = parsed[-1]
+    assert ds.columns[0].alias == "x 2"
+
+
 def test_datasource_from_persist():
 
     text = """

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

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

@@ -3276,7 +3276,7 @@ class EnvironmentConceptDict(dict):
             return default
 
     def __getitem__(
-        self, key, line_no: int | None = None
+        self, key, line_no: int | None = None, file: Path | None = None
     ) -> Concept | UndefinedConcept:
         try:
             return super(EnvironmentConceptDict, self).__getitem__(key)
@@ -3304,6 +3304,10 @@ class EnvironmentConceptDict(dict):
                 message += f" Suggestions: {matches}"
 
             if line_no:
+                if file:
+                    raise UndefinedConceptException(
+                        f"{file}: {line_no}: " + message, matches
+                    )
                 raise UndefinedConceptException(f"line: {line_no}: " + message, matches)
             raise UndefinedConceptException(message, matches)
 

{pytrilogy-0.0.2.35 → pytrilogy-0.0.2.36}/trilogy/executor.py

@@ -20,6 +20,8 @@ from trilogy.core.models import (
     ConceptDeclarationStatement,
     Datasource,
     CopyStatement,
+    ImportStatement,
+    MergeStatementV2,
 )
 from trilogy.dialect.base import BaseDialect
 from trilogy.dialect.enums import Dialects
@@ -104,6 +106,7 @@ class Executor(object):
                 ProcessedShowStatement,
                 ProcessedQueryPersist,
                 ProcessedCopyStatement,
+                ProcessedRawSQLStatement,
             ),
         ):
             return None
@@ -142,7 +145,6 @@ class Executor(object):
 
     @execute_query.register
     def _(self, query: str) -> CursorResult:
-
         return self.execute_text(query)[-1]
 
     @execute_query.register
@@ -181,6 +183,35 @@ class Executor(object):
             ],
         )
 
+    @execute_query.register
+    def _(self, query: ImportStatement) -> CursorResult:
+        self.environment.add_file_import(query.path, query.alias)
+        return MockResult(
+            [
+                {
+                    "path": query.path,
+                    "alias": query.alias,
+                }
+            ],
+            ["path", "alias"],
+        )
+
+    @execute_query.register
+    def _(self, query: MergeStatementV2) -> CursorResult:
+
+        self.environment.merge_concept(
+            query.source, query.target, modifiers=query.modifiers
+        )
+        return MockResult(
+            [
+                {
+                    "source": query.source.address,
+                    "target": query.target.address,
+                }
+            ],
+            ["source", "target"],
+        )
+
     @execute_query.register
     def _(self, query: ProcessedRawSQLStatement) -> CursorResult:
         return self.execute_raw_sql(query.text)

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

@@ -302,6 +302,9 @@ class ParseToObjects(Transformer):
     def IDENTIFIER(self, args) -> str:
         return args.value
 
+    def QUOTED_IDENTIFIER(self, args) -> str:
+        return args.value[1:-1]
+
     @v_args(meta=True)
     def concept_lit(self, meta: Meta, args) -> Concept:
         return self.environment.concepts.__getitem__(args[0], meta.line)
@@ -386,7 +389,7 @@ class ParseToObjects(Transformer):
             modifiers += concept_list[:-1]
         concept = concept_list[-1]
         resolved = self.environment.concepts.__getitem__(  # type: ignore
-            key=concept, line_no=meta.line
+            key=concept, line_no=meta.line, file=self.token_address
         )
         return ColumnAssignment(alias=alias, modifiers=modifiers, concept=resolved)
 

{pytrilogy-0.0.2.35 → pytrilogy-0.0.2.36}/trilogy/parsing/render.py

@@ -368,9 +368,15 @@ class Renderer:
 
     @to_string.register
     def _(self, arg: "ImportStatement"):
-        if arg.alias == DEFAULT_NAMESPACE:
-            return f"import {arg.path};"
-        return f"import {arg.path} as {arg.alias};"
+        path: str = str(arg.path).replace("\\", ".")
+        path = path.replace("/", ".")
+        if path.endswith(".preql"):
+            path = path.rsplit(".", 1)[0]
+        if path.startswith("."):
+            path = path[1:]
+        if arg.alias == DEFAULT_NAMESPACE or not arg.alias:
+            return f"import {path};"
+        return f"import {path} as {arg.alias};"
 
     @to_string.register
     def _(self, arg: "Concept"):

{pytrilogy-0.0.2.35 → pytrilogy-0.0.2.36}/trilogy/parsing/trilogy.lark

@@ -49,7 +49,7 @@
     
     //column_assignment
     //figure out if we want static
-    column_assignment: (raw_column_assignment | IDENTIFIER |  _static_functions  ) ":" concept_assignment
+    column_assignment: (raw_column_assignment | IDENTIFIER | QUOTED_IDENTIFIER |  _static_functions  ) ":" concept_assignment
     
     RAW_ENTRY.1: /raw\s*\(/s
 
@@ -292,6 +292,7 @@
     // base language constructs
     concept_lit: IDENTIFIER
     IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\-\.]*/
+    QUOTED_IDENTIFIER:  /`[a-zA-Z\_][a-zA-Z0-9\_\.\-\*\:\s]*`/
     QUOTED_ADDRESS:  /`[a-zA-Z\_][a-zA-Z0-9\_\.\-\*\:]*`/
     ADDRESS: IDENTIFIER
 

pytrilogy-0.0.2.35/tests/test_executor.py

@@ -1,8 +0,0 @@
-from trilogy import Dialects
-from pathlib import Path
-
-
-def test_file_parsing():
-    target = Path(__file__).parent / "test_env.preql"
-    parsed = Dialects.DUCK_DB.default_executor().parse_file(target)
-    assert len(list(parsed)) == 1