From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 14 May 2014 14:03:24 +0000 (-0400)
Subject: - Fixed bug in mutable extension where :class:`.MutableDict` did not
X-Git-Tag: rel_0_8_7~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1ba8e101665231c527be393e6873538e33eba3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed bug in mutable extension where :class:`.MutableDict` did not
report change events for the ``setdefault()`` dictionary operation.
fixes #3051
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 2925a03b57..743c2e8878 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -11,6 +11,14 @@
 .. changelog::
     :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
diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index d5acb18710..220b8d81a9 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 268af6e49b..40553a8c97 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'})