summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/attributes.py2
-rw-r--r--lib/sqlalchemy/orm/events.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 674c57fea..01f19d991 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -99,6 +99,8 @@ class QueryableAttribute(
for base in manager._bases:
if key in base:
self.dispatch._update(base[key].dispatch)
+ if base[key].dispatch._active_history:
+ self.dispatch._active_history = True
@util.memoized_property
def _supports_population(self):
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index 8a310479c..d73a20e93 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -2009,6 +2009,8 @@ class AttributeEvents(event.Events):
event_key.with_dispatch_target(mgr[target.key]).base_listen(
propagate=True
)
+ if active_history:
+ mgr[target.key].dispatch._active_history = True
def append(self, target, value, initiator):
"""Receive a collection append event.