pytrilogy 0.0.3.76__py3-none-any.whl → 0.0.3.77__py3-none-any.whl

{pytrilogy-0.0.3.76.dist-info → pytrilogy-0.0.3.77.dist-info}/METADATA

@@ -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.dist-info → pytrilogy-0.0.3.77.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.76.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=sZwmfj6wT6T8WzjItYxWbPez-bFEh_9z7q4rztVOGdE,303
+pytrilogy-0.0.3.77.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=MaNvYTE25EzVDkpklTQu2tZ8pSfm2j1aCH9wBRXrMpY,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=eKb_EJvSqjN9tGbdVEViwdtwwh8fZ3-jpOEDqL71y70,1691
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -97,9 +97,9 @@ trilogy/parsing/common.py,sha256=yV1AckK0h8u1OFeGQBTMu-wuW5m63c5CcZuPicsTH_w,306
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=Xwwsv2C9kSNv2q-HrrKC1f60JNHShXcCMzstTSEbiCw,154
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=4XL-YOEXVZ77w8QKsvWq5gePMo-S-P3vIhhcsywbzNM,74827
+trilogy/parsing/parse_engine.py,sha256=c8NzO4xR3egV-tKS02X6Ja5P4-QfWtnTzkfEn0eKYeU,76660
 trilogy/parsing/render.py,sha256=HSNntD82GiiwHT-TWPLXAaIMWLYVV5B5zQEsgwrHIBE,19605
-trilogy/parsing/trilogy.lark,sha256=v2UqMBhU9hn9km4mvQkk3E2wsEZjJ4cz4wU72NFFvU4,14993
+trilogy/parsing/trilogy.lark,sha256=wiGXJdKfPTG7E_XdkN1rf9g9Yy1-UMVAXyTxtrBPm9w,15037
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
 trilogy/std/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -110,8 +110,8 @@ trilogy/std/money.preql,sha256=XWwvAV3WxBsHX9zfptoYRnBigcfYwrYtBHXTME0xJuQ,2082
 trilogy/std/net.preql,sha256=7l7MqIjs6TDCpO6dBAoNJU81Ex255jZRK36kBgE1GDs,158
 trilogy/std/ranking.preql,sha256=LDoZrYyz4g3xsII9XwXfmstZD-_92i1Eox1UqkBIfi8,83
 trilogy/std/report.preql,sha256=LbV-XlHdfw0jgnQ8pV7acG95xrd1-p65fVpiIc-S7W4,202
-pytrilogy-0.0.3.76.dist-info/METADATA,sha256=NZ4JMPMai3zouER09hbjd6F2cTwSbTqAIzQSR7JmyjM,9734
-pytrilogy-0.0.3.76.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytrilogy-0.0.3.76.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.76.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.76.dist-info/RECORD,,
+pytrilogy-0.0.3.77.dist-info/METADATA,sha256=LApdnLN-kkLR7hIwuXiUQuAS_cFqfzITIcXqME1p0Jo,9734
+pytrilogy-0.0.3.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytrilogy-0.0.3.77.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.77.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.77.dist-info/RECORD,,

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

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)
             )

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