summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2022-06-24 10:31:46 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2022-06-24 10:32:29 -0400
commit9966bc72d41c968d7587a9e46b36c214a3ad6cf1 (patch)
treea5d78f1814c92725d376791218dc8fb5edb4d0ff
parentb32cac39907b94df4f77983e31e3f15a80d0f7e2 (diff)
downloadsqlalchemy-9966bc72d41c968d7587a9e46b36c214a3ad6cf1.tar.gz
add fallback for old mutable format
Fixed regression caused by :ticket:`8133` where the pickle format for mutable attributes was changed, without a fallback to recognize the old format, causing in-place upgrades of SQLAlchemy to no longer be able to read pickled data from previous versions. A check plus a fallback for the old format is now in place. Fixes: #8133 Change-Id: I9029729b4bc56c8b3145797869229eeff48a3b3b (cherry picked from commit 271c38fd15b94d8acd0e6f054c8001b22535844e)
-rw-r--r--doc/build/changelog/unreleased_14/mutable_fix.rst9
-rw-r--r--lib/sqlalchemy/ext/mutable.py10
2 files changed, 17 insertions, 2 deletions
diff --git a/doc/build/changelog/unreleased_14/mutable_fix.rst b/doc/build/changelog/unreleased_14/mutable_fix.rst
new file mode 100644
index 000000000..2c96878b8
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/mutable_fix.rst
@@ -0,0 +1,9 @@
+.. change::
+ :tags: bug, orm, regression
+ :tickets: 8133
+
+ Fixed regression caused by :ticket:`8133` where the pickle format for
+ mutable attributes was changed, without a fallback to recognize the old
+ format, causing in-place upgrades of SQLAlchemy to no longer be able to
+ read pickled data from previous versions. A check plus a fallback for the
+ old format is now in place.
diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index 934ac37a0..cbec06a31 100644
--- a/lib/sqlalchemy/ext/mutable.py
+++ b/lib/sqlalchemy/ext/mutable.py
@@ -502,8 +502,14 @@ class MutableBase(object):
def unpickle(state, state_dict):
if "ext.mutable.values" in state_dict:
- for val in state_dict["ext.mutable.values"][key]:
- val._parents[state] = key
+ collection = state_dict["ext.mutable.values"]
+ if isinstance(collection, list):
+ # legacy format
+ for val in collection:
+ val._parents[state] = key
+ else:
+ for val in state_dict["ext.mutable.values"][key]:
+ val._parents[state] = key
event.listen(parent_cls, "load", load, raw=True, propagate=True)
event.listen(