Merge "Run PK/FK sync for multi-level inheritance w/ no intermediary update"

2 files changed, 20 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index 8a77d5052..f0ba6051d 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -622,7 +622,8 @@ class OneToManyDP(DependencyProcessor):
 class ManyToOneDP(DependencyProcessor):
     def __init__(self, prop):
         DependencyProcessor.__init__(self, prop)
-        self.mapper._dependency_processors.append(DetectKeySwitch(prop))
+        for mapper in self.mapper.self_and_descendants:
+            mapper._dependency_processors.append(DetectKeySwitch(prop))
 
     def per_property_dependencies(
         self,
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index 5106bff94..072d34f8c 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -680,6 +680,7 @@ def _collect_update_commands(
             continue
 
         has_all_pks = True
+        expect_pk_cascaded = False
         if bulk:
             # keys here are mapped attribute keys, so
             # look at mapper attribute keys for pk
@@ -704,6 +705,7 @@ def _collect_update_commands(
                         or ("pk_cascaded", state, col)
                         in uowtransaction.attributes
                     ):
+                        expect_pk_cascaded = True
                         pk_params[col._label] = history.added[0]
                         params.pop(col.key, None)
                     else:
@@ -731,6 +733,22 @@ def _collect_update_commands(
                 has_all_defaults,
                 has_all_pks,
             )
+        elif expect_pk_cascaded:
+            # no UPDATE occurs on this table, but we expect that CASCADE rules
+            # have changed the primary key of the row; propagate this event to
+            # other columns that expect to have been modified. this normally
+            # occurs after the UPDATE is emitted however we invoke it here
+            # explicitly in the absense of our invoking an UPDATE
+            for m, equated_pairs in mapper._table_to_equated[table]:
+                sync.populate(
+                    state,
+                    m,
+                    state,
+                    m,
+                    equated_pairs,
+                    uowtransaction,
+                    mapper.passive_updates,
+                )
 
 
 def _collect_post_update_commands(