diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-14 10:03:24 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-14 10:03:51 -0400 |
| commit | cf1ba8e101665231c527be393e6873538e33eba3 (patch) | |
| tree | 2b27c2d3d38d276f76476939fc3a8080d9eb8055 | |
| parent | 64fbbde94018c24bde07b778539e7b7b0844d2b0 (diff) | |
| download | sqlalchemy-cf1ba8e101665231c527be393e6873538e33eba3.tar.gz | |
- Fixed bug in mutable extension where :class:`.MutableDict` did not
report change events for the ``setdefault()`` dictionary operation.
fixes #3051
| -rw-r--r-- | doc/build/changelog/changelog_08.rst | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/mutable.py | 5 | ||||
| -rw-r--r-- | test/ext/test_mutable.py | 17 |
3 files changed, 30 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst index 2925a03b5..743c2e887 100644 --- a/doc/build/changelog/changelog_08.rst +++ b/doc/build/changelog/changelog_08.rst @@ -12,6 +12,14 @@ :version: 0.8.7 .. change:: + :tags: bug, ext + :versions: 0.9.5 + :tickets: 3051 + + Fixed bug in mutable extension where :class:`.MutableDict` did not + report change events for the ``setdefault()`` dictionary operation. + + .. change:: :tags: bug, mysql :versions: 0.9.5 :pullreq: bitbucket:15 diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py index d5acb1871..220b8d81a 100644 --- a/lib/sqlalchemy/ext/mutable.py +++ b/lib/sqlalchemy/ext/mutable.py @@ -610,6 +610,11 @@ class MutableDict(Mutable, dict): dict.__setitem__(self, key, value) self.changed() + + def setdefault(self, key, value): + dict.setdefault(self, key, value) + self.changed() + def __delitem__(self, key): """Detect dictionary del events and emit change events.""" dict.__delitem__(self, key) diff --git a/test/ext/test_mutable.py b/test/ext/test_mutable.py index 268af6e49..40553a8c9 100644 --- a/test/ext/test_mutable.py +++ b/test/ext/test_mutable.py @@ -86,6 +86,23 @@ class _MutableDictTestBase(object): eq_(f1.data, {}) + def test_setdefault(self): + sess = Session() + + f1 = Foo(data={'a': 'b'}) + sess.add(f1) + sess.commit() + + f1.data.setdefault('c', 'd') + sess.commit() + + eq_(f1.data, {'a': 'b', 'c': 'd'}) + + f1.data.setdefault('c', 'q') + sess.commit() + + eq_(f1.data, {'a': 'b', 'c': 'd'}) + def test_replace(self): sess = Session() f1 = Foo(data={'a': 'b'}) |