Don't include $orderby in updates.

This causes MongoDB to simply ignore the update command. [ fix mongoid/mongoid#2430 ]
mattparlane · Oct 4, 2012 · 9d27db8 · 9d27db8
1 parent b5f6f49
commit 9d27db8
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,12 @@
 
         Moped::Session.new([ "ssl.mongohq.com:10004" ], ssl: true)
 
+## 1.2.6
+
+### Resolved Issues
+
+* mongoid/mongoid\#2430 Don't include $orderby criteria in update calls.
+
 ## 1.2.5
 
 ### Resolved Issues

diff --git a/lib/moped/query.rb b/lib/moped/query.rb
@@ -309,7 +309,7 @@ def update(change, flags = nil)
         session.context.update(
           operation.database,
           operation.collection,
-          operation.selector,
+          operation.selector["$query"] || operation.selector,
           change,
           flags: flags
         )

diff --git a/spec/moped/query_spec.rb b/spec/moped/query_spec.rb
@@ -503,25 +503,59 @@
 
     describe "#update" do
 
-      before do
-        users.insert(documents)
-        users.find(scope: scope).update("$set" => { "updated" => true })
+      context "when no sorting is provided" do
+
+        before do
+          users.insert(documents)
+          users.find(scope: scope).update("$set" => { "updated" => true })
+        end
+
+        it "updates the first matching document" do
+          users.find(scope: scope, updated: true).count.should eq 1
+        end
       end
 
-      it "updates the first matching document" do
-        users.find(scope: scope, updated: true).count.should eq 1
+      context "when sorting is provided" do
+
+        before do
+          users.insert(documents)
+          users.find(scope: scope).
+            sort(updated: 1).
+            update("$set" => { "updated" => true })
+        end
+
+        it "updates the first matching document" do
+          users.find(scope: scope, updated: true).count.should eq 1
+        end
       end
     end
 
     describe "#update_all" do
 
-      before do
-        users.insert(documents)
-        users.find(scope: scope).update_all("$set" => { "updated" => true })
+      context "when no sorting is provided" do
+
+        before do
+          users.insert(documents)
+          users.find(scope: scope).update_all("$set" => { "updated" => true })
+        end
+
+        it "updates all matching documents" do
+          users.find(scope: scope, updated: true).count.should eq 2
+        end
       end
 
-      it "updates all matching documents" do
-        users.find(scope: scope, updated: true).count.should eq 2
+      context "when sorting is provided" do
+
+        before do
+          users.insert(documents)
+          users.find(scope: scope).
+            sort(updated: 1).
+            update_all("$set" => { "updated" => true })
+        end
+
+        it "updates all matching documents" do
+          users.find(scope: scope, updated: true).count.should eq 2
+        end
       end
     end