From a09972dcab2d154044cfd2d60bf72e4a3f7568f1 Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Wed, 1 Feb 2023 22:25:03 +0100 Subject: Guard against wrong dataclass mapping Ensure that the decorator style @registry.mapped_as_dataclass and MappedAsDataclass are not mixed. Fixes: #9211 Change-Id: I5cd94cae862122e4f627d0d051495b3789cf6de5 --- lib/sqlalchemy/orm/decl_base.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py index a858f12cb..8ce9d59d0 100644 --- a/lib/sqlalchemy/orm/decl_base.py +++ b/lib/sqlalchemy/orm/decl_base.py @@ -1036,6 +1036,17 @@ class _ClassScanMapperConfig(_MapperConfig): if not dataclass_setup_arguments: return + # can't use is_dataclass since it uses hasattr + if "__dataclass_fields__" in self.cls.__dict__: + raise exc.InvalidRequestError( + f"Class {self.cls} is already a dataclass; ensure that " + "base classes / decorator styles of establishing dataclasses " + "are not being mixed. " + "This can happen if a class that inherits from " + "'MappedAsDataclass', even indirectly, is been mapped with " + "'@registry.mapped_as_dataclass'" + ) + manager = instrumentation.manager_of_class(self.cls) assert manager is not None -- cgit v1.2.1