From 652d36f599893d27b90faf94f85d0156fb912fa1 Mon Sep 17 00:00:00 2001 From: John Davis Date: Thu, 4 Apr 2024 23:51:38 -0400 Subject: [PATCH] Fix method resolution order for base model class --- lib/galaxy/model/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 4099f769f029..daafd55e7b68 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -246,7 +246,7 @@ def get_uuid(uuid: Optional[Union[UUID, str]] = None) -> UUID: return UUID(str(uuid)) -class Base(_HasTable, DeclarativeBase): +class Base(DeclarativeBase, _HasTable): __abstract__ = True metadata = MetaData(naming_convention=NAMING_CONVENTION) mapper_registry.metadata = metadata