Merge pull request #93 from Ariana-B/improve-attribute-name-parsing

Support prefixed attribute names in cql2-text and ecql parsing
geopython · Jul 8, 2024 · dbe4e9e · dbe4e9e
2 parents 23f172c + 5318c6b
commit dbe4e9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pygeofilter/parsers/cql2_text/grammar.lark b/pygeofilter/parsers/cql2_text/grammar.lark
@@ -53,6 +53,7 @@
           | expression "LIKE"i SINGLE_QUOTED                                 -> like
           | expression "IN"i "(" expression ( "," expression )* ")"          -> in_
           | expression "IS"i "NULL"i                                         -> null
+          | expression "IS"i "NOT"i "NULL"i                                  -> not_null
           | "INCLUDE"i                                                       -> include
           | "EXCLUDE"i                                                       -> exclude
           | spatial_predicate
@@ -137,7 +138,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'")