pytrilogy 0.0.3.76__tar.gz → 0.0.3.77__tar.gz

{pytrilogy-0.0.3.76/pytrilogy.egg-info → pytrilogy-0.0.3.77}/PKG-INFO

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

{pytrilogy-0.0.3.76 → pytrilogy-0.0.3.77/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.76 → pytrilogy-0.0.3.77}/tests/test_parse_engine.py

@@ -3,6 +3,7 @@ from pytest import raises
 from trilogy.core.exceptions import UndefinedConceptException
 from trilogy.core.models.environment import Environment
 from trilogy.parsing.parse_engine import (
+    ERROR_CODES,
     PARSER,
     InvalidSyntaxException,
     ParseToObjects,
@@ -66,18 +67,45 @@ address fun;
     x.run_second_parse_pass()
 
 
-TEXT2 = """
+def test_from_error():
+    env = Environment()
+    TEXT2 = """
+    const a <- 1;
+
+    select
+        a,
+    FROM a
+    ;
+    """
+    with raises(InvalidSyntaxException) as e:
+        env.parse(TEXT2)
+    assert ERROR_CODES[101] in str(e.value), e.value
+
+
+def test_error_order_by_missing():
+    env = Environment()
+    TEXT2 = """
 const a <- 1;
 
 select
     a,
-FROM a
+order by a
 ;
-"""
+    """
+    with raises(InvalidSyntaxException) as e:
+        env.parse(TEXT2)
+    assert ERROR_CODES[210] in str(e.value)
 
 
-def test_from_error():
+def test_alias_error():
     env = Environment()
-
-    with raises(InvalidSyntaxException):
+    TEXT2 = """
+    const a <- 1;
+
+    select
+        a+2 fun,
+    ;
+    """
+    with raises(InvalidSyntaxException) as e:
         env.parse(TEXT2)
+    assert ERROR_CODES[201] in str(e.value), e.value

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

{pytrilogy-0.0.3.76 → pytrilogy-0.0.3.77}/trilogy/parsing/parse_engine.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from re import IGNORECASE
 from typing import Any, List, Optional, Tuple, Union
 
-from lark import Lark, ParseTree, Transformer, Tree, v_args
+from lark import Lark, ParseTree, Token, Transformer, Tree, v_args
 from lark.exceptions import (
     UnexpectedCharacters,
     UnexpectedEOF,
@@ -2091,6 +2091,15 @@ def parse_text_raw(text: str, environment: Optional[Environment] = None):
     PARSER.parse(text)
 
 
+ERROR_CODES: dict[int, str] = {
+    # 100 code are SQL compatability errors
+    101: "Trilogy does not have a FROM clause (Datasource resolution is automatic). Remove the FROM clause.",
+    # 200 codes relate to required explicit syntax (we could loosen these?)
+    201: 'Alias must be specified with "AS" - e.g. `SELECT x AS y`',
+    210: "Order by must be explicit about direction - specify `asc` or `desc`.",
+}
+
+
 def parse_text(
     text: str,
     environment: Optional[Environment] = None,
@@ -2140,9 +2149,43 @@ def parse_text(
         ValidationError,
         TypeError,
     ) as e:
-        if isinstance(
-            e, (UnexpectedCharacters, UnexpectedEOF, UnexpectedInput, UnexpectedToken)
-        ):
+        if isinstance(e, UnexpectedToken):
+            if e.expected == {"ORDERING_DIRECTION"}:
+                code = 210
+                raise InvalidSyntaxException(
+                    f"Syntax [{code}]:"
+                    + ERROR_CODES[code]
+                    + "\nContext:\n"
+                    + e.get_context(text.replace("\n", " "), 20)
+                )
+            parsed_tokens = (
+                [x.value for x in e.token_history] if e.token_history else []
+            )
+            if parsed_tokens == ["FROM"]:
+                code = 101
+                raise InvalidSyntaxException(
+                    f"Syntax [{code}]:"
+                    + ERROR_CODES[code]
+                    + "\nContext:\n"
+                    + e.get_context(text.replace("\n", " "), 20)
+                )
+            # recovery attempt for aliasing
+            try:
+                e.interactive_parser.feed_token(Token("AS", "AS"))
+                e.interactive_parser.feed_token(e.token)
+                raise InvalidSyntaxException(
+                    f"Syntax [{ERROR_CODES[201]}]:"
+                    + ERROR_CODES[201]
+                    + "\nContext:\n"
+                    + e.get_context(text.replace("\n", " "), 20)
+                )
+            except UnexpectedToken:
+                pass
+            raise InvalidSyntaxException(
+                str(e) + "\nContext:\n" + e.get_context(text.replace("\n", " "), 20)
+            )
+        elif isinstance(e, (UnexpectedCharacters, UnexpectedEOF, UnexpectedInput)):
+
             raise InvalidSyntaxException(
                 str(e) + "\nContext:\n" + e.get_context(text.replace("\n", " "), 20)
             )

{pytrilogy-0.0.3.76 → pytrilogy-0.0.3.77}/trilogy/parsing/trilogy.lark

@@ -130,7 +130,9 @@
     
     over_list: concept_lit (","  concept_lit )* ","?
     
-    !ordering: /ASC|DESC/i  ("NULLS"i /FIRST|LAST|AUTO/i )?
+    ORDERING_DIRECTION: /ASC|DESC/i
+
+    !ordering: ORDERING_DIRECTION  ("NULLS"i /FIRST|LAST|AUTO/i )?
     
     order_by: "ORDER"i "BY"i order_list