From 11a1d5e70450300310ff7fafeeb03fe1baa9380e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 12 May 2023 14:34:00 -0400 Subject: include create_type in pg.ENUM.adapt; test all attrs Fixed apparently very old issue where the :paramref:`_postgresql.ENUM.create_type` parameter, when set to its non-default of ``False``, would not be propagated when the :class:`_schema.Column` which it's a part of were copied, as is common when using ORM Declarative mixins. Fixes: #9773 Change-Id: I79a7c6f052ec39b42400d92bf591c791feca573b --- lib/sqlalchemy/dialects/postgresql/named_types.py | 3 +++ lib/sqlalchemy/sql/type_api.py | 2 ++ 2 files changed, 5 insertions(+) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/dialects/postgresql/named_types.py b/lib/sqlalchemy/dialects/postgresql/named_types.py index 92aba6f63..4412d841b 100644 --- a/lib/sqlalchemy/dialects/postgresql/named_types.py +++ b/lib/sqlalchemy/dialects/postgresql/named_types.py @@ -312,6 +312,9 @@ class ENUM(NamedType, sqltypes.NativeForEmulated, sqltypes.Enum): kw.setdefault("values_callable", impl.values_callable) kw.setdefault("omit_aliases", impl._omit_aliases) kw.setdefault("_adapted_from", impl) + if type_api._is_native_for_emulated(impl.__class__): + kw.setdefault("create_type", impl.create_type) + return cls(**kw) def create(self, bind=None, checkfirst=True): diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py index 5af12cb93..312034e9d 100644 --- a/lib/sqlalchemy/sql/type_api.py +++ b/lib/sqlalchemy/sql/type_api.py @@ -1482,6 +1482,8 @@ class Emulated(TypeEngineMixin): # as only the default logic is implemented. return cls.adapt_native_to_emulated(self, **kw) else: + # this would be, both classes are Enum, or both classes + # are postgresql.ENUM if issubclass(cls, self.__class__): return self.adapt_to_emulated(cls, **kw) else: -- cgit v1.2.1