schema type comparison across classes

1 files changed, 12 insertions, 19 deletions

diff --git a/bsfs/query/validator.py b/bsfs/query/validator.py
index 75b51ca..ecea951 100644
--- a/bsfs/query/validator.py
+++ b/bsfs/query/validator.py
@@ -113,25 +113,18 @@ class Filter():
         for pred in node:
             # parse child expression
             subdom, subrng = self._parse_predicate_expression(pred)
-            try:
-                # determine overall domain
-                if dom is None or subdom < dom: # pick most specific domain
-                    dom = subdom
-                # domains must be related across all child expressions
-                if not subdom <= dom and not subdom >= dom:
-                    raise errors.ConsistencyError(f'domains {subdom} and {dom} are not related')
-            except TypeError as err: # compared literal vs. node
-                raise errors.ConsistencyError(f'domains {subdom} and {dom} are not of the same type') from err
-
-            try:
-                # determine overall range
-                if rng is None or subrng > rng: # pick most generic range
-                    rng = subrng
-                # ranges must be related across all child expressions
-                if not subrng <= rng and not subrng >= rng:
-                    raise errors.ConsistencyError(f'ranges {subrng} and {rng} are not related')
-            except TypeError as err: # compared literal vs. node
-                raise errors.ConsistencyError(f'ranges {subrng} and {rng} are not of the same type') from err
+            # determine overall domain
+            if dom is None or subdom < dom: # pick most specific domain
+                dom = subdom
+            # domains must be related across all child expressions
+            if not subdom <= dom and not subdom >= dom:
+                raise errors.ConsistencyError(f'domains {subdom} and {dom} are not related')
+            # determine overall range
+            if rng is None or subrng > rng: # pick most generic range
+                rng = subrng
+            # ranges must be related across all child expressions
+            if not subrng <= rng and not subrng >= rng:
+                raise errors.ConsistencyError(f'ranges {subrng} and {rng} are not related')
         # OneOf guarantees at least one expression, dom and rng are always bsc.Vertex.
         # mypy does not realize this, hence we ignore the warning.
         return dom, rng # type: ignore [return-value]