Improve cql2-text and ecql parsing to all for prefixed attribute names

geopython · Apr 5, 2024 · 122a5a6 · 122a5a6
1 parent 06254fc
commit 122a5a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pygeofilter/parsers/cql2_text/grammar.lark b/pygeofilter/parsers/cql2_text/grammar.lark
@@ -137,7 +137,7 @@ DATETIME: /[0-9]{4}-?[0-1][0-9]-?[0-3][0-9][T ][0-2][0-9]:?[0-5][0-9]:?[0-5][0-9
 
 
 
-attribute: /[a-zA-Z][a-zA-Z_:0-9]+/
+attribute: /[a-zA-Z][a-zA-Z_:0-9.]+/
          | DOUBLE_QUOTED
 
 

diff --git a/pygeofilter/parsers/ecql/grammar.lark b/pygeofilter/parsers/ecql/grammar.lark
@@ -114,7 +114,7 @@ BOOLEAN: ( "TRUE" | "FALSE" )
 DOUBLE_QUOTED: "\"" /.*?/ "\""
 SINGLE_QUOTED: "'" /.*?/ "'"
 
-QUALIFIED_NAME: NAME ":" NAME
+QUALIFIED_NAME: (NAME ("." | ":"))+ NAME
 
 %import .wkt.ewkt_geometry
 %import .iso8601.DATETIME

diff --git a/tests/parsers/ecql/test_parser.py b/tests/parsers/ecql/test_parser.py
@@ -41,6 +41,12 @@ def test_namespace_attribute_eq_literal():
         "A",
     )
 
+def test_prefixed_attribute_eq_literal():
+    result = parse("properties.ns:attr = 'A'")
+    assert result == ast.Equal(
+        ast.Attribute("properties.ns:attr"),
+        "A",
+    )
 
 def test_attribute_eq_literal():
     result = parse("attr = 'A'")