Fix UUID handling in OData queries

odata_query/grammar.py

@@ -18,6 +18,7 @@
 _INTEGER = r"[+-]?\d+"
 _DATE = r"[1-9]\d{3}-(?:0\d|1[0-2])-(?:[0-2]\d|3[01])"
 _TIME = r"(?:[01]\d|2[0-3]):[0-5]\d(:?:[0-5]\d(?:\.\d{1,12})?)"
+_UUID_PATTERN = r"'?[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}'?"
 
 # Defines known functions and min/max nr of args:
 ODATA_FUNCTIONS = {
@@ -132,6 +133,12 @@ def DURATION(self, t):
         t.value = ast.Duration(val)
         return t
 
+    @_(_UUID_PATTERN)
+    def GUID(self, t):
+        ":meta private:"
+        t.value = ast.GUID(t.value.strip("'"))
+        return t
+
     @_(r"'(?:[^']|'')*'")
     def STRING(self, t):
         ":meta private:"
@@ -153,12 +160,6 @@ def GEOGRAPHY(self, t):
         t.value = ast.Geography(t.value[10:-1])
         return t
 
-    @_(r"[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}")
-    def GUID(self, t):
-        ":meta private:"
-        t.value = ast.GUID(t.value)
-        return t
-
     @_(_DATE + r"T" + _TIME + r"?(Z|[+-](?:[01]\d|2[0-3]):[0-5]\d)?")
     def DATETIME(self, t):
         ":meta private:"

odata_query/sqlalchemy/common.py

@@ -19,7 +19,7 @@
     or_,
     true,
 )
-from sqlalchemy.types import Date, Time
+from sqlalchemy.types import Date, Time, Uuid
 
 from odata_query import ast, exceptions as ex, typing, visitor
 
@@ -81,7 +81,7 @@ def visit_Duration(self, node: ast.Duration) -> BindParameter:
 
     def visit_GUID(self, node: ast.GUID) -> BindParameter:
         ":meta private:"
-        return literal(node.val)
+        return literal(node.py_val, type_=Uuid())
 
     def visit_List(self, node: ast.List) -> list:
         ":meta private:"