diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2023-04-10 10:28:44 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2023-04-10 10:33:09 -0400 |
| commit | bf51ff3248d1c87cbc7a846e2e6886339d59b9cb (patch) | |
| tree | f00471bbd6e497de058c6064ac2cdd74dd1d8014 /lib/sqlalchemy | |
| parent | 1eb72d9725d0df60206151805c927ad3c6566fb7 (diff) | |
| download | sqlalchemy-bf51ff3248d1c87cbc7a846e2e6886339d59b9cb.tar.gz | |
include declared_directive as a declared_attr
Fixed issue where the :meth:`_orm.declared_attr.directive` modifier was not
correctly honored for subclasses when applied to the ``__mapper_args__``
special method name, as opposed to direct use of
:class:`_orm.declared_attr`. The two constructs should have identical
runtime behaviors.
Fixes: #9625
Change-Id: I0dfe9e73bb45f70dbebc8e94ce280ad3b52e867f
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/decl_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py index bd62c3c1b..beede0ddb 100644 --- a/lib/sqlalchemy/orm/decl_base.py +++ b/lib/sqlalchemy/orm/decl_base.py @@ -260,9 +260,9 @@ def _mapper( @util.preload_module("sqlalchemy.orm.decl_api") def _is_declarative_props(obj: Any) -> bool: - declared_attr = util.preloaded.orm_decl_api.declared_attr + _declared_attr_common = util.preloaded.orm_decl_api._declared_attr_common - return isinstance(obj, (declared_attr, util.classproperty)) + return isinstance(obj, (_declared_attr_common, util.classproperty)) def _check_declared_props_nocascade( |