Clear delayed atomic sets before substitution. Fixes #1659

mongodb · Feb 6, 2012 · 5b06944 · 5b06944
1 parent 58c236e
commit 5b06944
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ For instructions on upgrading to newer versions, visit
 
 * \#1668 Ensure Mongoid logger exists before calling warn. (Rémy Coutable)
 
+* \#1659 Clear delayed atomic sets when resetting the same embedded relation.
+
 * \#1656/#1657 Don't hit database for uniqueness validation if BOTH scope
   and attribute hasn't changed. (priyaaank)
 

diff --git a/lib/mongoid/relations/embedded/many.rb b/lib/mongoid/relations/embedded/many.rb
@@ -288,6 +288,7 @@ def substitute(replacement)
               proxy.clear
             else
               atomically(:$set) do
+                base.delayed_atomic_sets.clear
                 if replacement.first.is_a?(Hash)
                   replacement = Many.builder(base, metadata, replacement).build
                 end

diff --git a/spec/functional/mongoid/relations/embedded/many_spec.rb b/spec/functional/mongoid/relations/embedded/many_spec.rb
@@ -316,6 +316,7 @@
         end
 
         context "when setting the relation multiple times" do
+
           let(:address_two) do
             Address.new(:street => "kudamm")
           end