diff --git a/subgrounds/errors.py b/subgrounds/errors.py index 26a6dfc..2e01cb8 100644 --- a/subgrounds/errors.py +++ b/subgrounds/errors.py @@ -6,10 +6,6 @@ class SchemaError(SubgroundsError): """Errors related to schema""" -class QueryError(SubgroundsError): - """Errors related to queries""" - - class TransformError(SubgroundsError): """Errors related to transforms""" diff --git a/subgrounds/query.py b/subgrounds/query.py index f0ee004..3e36cd2 100644 --- a/subgrounds/query.py +++ b/subgrounds/query.py @@ -30,7 +30,7 @@ from pipe import map, take, traverse, where -from .errors import QueryError +from .errors import SubgroundsError from .schema import SchemaMeta, TypeMeta, TypeRef from .utils import ( extract_data, @@ -550,7 +550,7 @@ def map( return map_f(new_selection) case _: - raise QueryError(f"map: invalid priority {priority}") + raise SubgroundsError(f"map: invalid priority {priority}") def map_args( self, @@ -871,7 +871,7 @@ def vardef_of_arg(arg): def combine(self: Selection, other: Selection) -> Selection: if self.key != other.key: - raise QueryError(f"Selection.combine: {self.key} != {other.key}") + raise SubgroundsError(f"Selection.combine: {self.key} != {other.key}") return Selection( fmeta=self.fmeta, diff --git a/subgrounds/schema.py b/subgrounds/schema.py index ccb9a43..8aa7a7f 100644 --- a/subgrounds/schema.py +++ b/subgrounds/schema.py @@ -410,4 +410,3 @@ def type_of( """Returns the argument or field definition's underlying type""" return self.type_of_typeref(tmeta.type_) - return self.type_of_typeref(tmeta.type_)