luciano/monger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make monger.collection/upsert actually upsert

Browse source 
Headdesk
This commit is contained in:
Michael Klishin 2013-04-17 02:01:22 +04:00
parent bdf0082372
commit a39c13a574
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/clojure/monger/collection.clj
View file

@ -411,9 +411,9 @@
sets :upsert to true. sets :upsert to true.
See monger.collection/update documentation" See monger.collection/update documentation"
[^String collection ^Map conditions ^Map document & {:keys [upsert multi write-concern] :or {multi false [^String collection ^Map conditions ^Map document & {:keys [multi write-concern] :or {multi false
write-concern monger.core/*mongodb-write-concern*}}] write-concern monger.core/*mongodb-write-concern*}}]
(update collection conditions document :multi multi :write-concern write-concern)) (update collection conditions document :multi multi :write-concern write-concern :upsert true))
(defn ^WriteResult update-by-id (defn ^WriteResult update-by-id
"Update a document with given id" "Update a document with given id"

17
test/monger/test/updating_test.clj
View file

@ -74,7 +74,7 @@
(deftest ^{:updating true} save-a-new-document (deftest ^{:updating true} save-a-new-document
(let [collection "people" (let [collection "people"
document {:name "Joe" :age 30}] document {:name "Joe" :age 30}]
(is (monger.result/ok? (mc/save "people" document))) (is (mr/ok? (mc/save "people" document)))
(is (= 1 (mc/count collection))))) (is (= 1 (mc/count collection)))))
(deftest ^{:updating true} save-and-return-a-new-document (deftest ^{:updating true} save-and-return-a-new-document
@ -99,7 +99,7 @@
(let [collection "people" (let [collection "people"
doc-id "people-1" doc-id "people-1"
document { :_id doc-id, :name "Joe", :age 30 }] document { :_id doc-id, :name "Joe", :age 30 }]
(is (monger.result/ok? (mc/insert "people" document))) (is (mr/ok? (mc/insert "people" document)))
(is (= 1 (mc/count collection))) (is (= 1 (mc/count collection)))
(mc/save collection { :_id doc-id, :name "Alan", :age 40 }) (mc/save collection { :_id doc-id, :name "Alan", :age 40 })
(is (= 1 (mc/count collection { :name "Alan", :age 40 }))))) (is (= 1 (mc/count collection { :name "Alan", :age 40 })))))
@ -118,7 +118,7 @@
(let [collection "people" (let [collection "people"
doc-id (monger.util/object-id) doc-id (monger.util/object-id)
document { :_id doc-id, :name "Joe", :age 30 }] document { :_id doc-id, :name "Joe", :age 30 }]
(is (monger.result/ok? (mc/insert "people" document))) (is (mr/ok? (mc/insert "people" document)))
(is (= 1 (mc/count collection))) (is (= 1 (mc/count collection)))
(is (= 0 (mc/count collection { :has_kids true }))) (is (= 0 (mc/count collection { :has_kids true })))
(mc/update collection { :_id doc-id } { $set { :has_kids true } }) (mc/update collection { :_id doc-id } { $set { :has_kids true } })
@ -130,7 +130,7 @@
doc-id (monger.util/object-id) doc-id (monger.util/object-id)
document { :_id doc-id :abc 0 :def 10 }] document { :_id doc-id :abc 0 :def 10 }]
(mc/remove collection) (mc/remove collection)
(is (monger.result/ok? (mc/insert collection document))) (is (mr/ok? (mc/insert collection document)))
(is (= 1 (mc/count collection {:abc {$exists true} :def {$exists true}}))) (is (= 1 (mc/count collection {:abc {$exists true} :def {$exists true}})))
(mc/update collection {:abc {$exists true} :def {$exists true}} {$inc {:abc 1 :def 0}}) (mc/update collection {:abc {$exists true} :def {$exists true}} {$inc {:abc 1 :def 0}})
(is (= 1 (mc/count collection { :abc 1 }))))) (is (= 1 (mc/count collection { :abc 1 })))))
@ -143,9 +143,9 @@
date (Date.) date (Date.)
doc { :created-at date, :data-store "MongoDB", :language "Clojure", :_id doc-id } doc { :created-at date, :data-store "MongoDB", :language "Clojure", :_id doc-id }
modified-doc { :created-at date, :data-store "MongoDB", :language "Erlang", :_id doc-id }] modified-doc { :created-at date, :data-store "MongoDB", :language "Erlang", :_id doc-id }]
(is (not (monger.result/updated-existing? (mc/update collection { :language "Clojure" } doc :upsert true)))) (is (not (mr/updated-existing? (mc/update collection { :language "Clojure" } doc :upsert true))))
(is (= 1 (mc/count collection))) (is (= 1 (mc/count collection)))
(is (monger.result/updated-existing? (mc/update collection { :language "Clojure" } modified-doc :multi false :upsert true))) (is (mr/updated-existing? (mc/update collection { :language "Clojure" } modified-doc :multi false :upsert true)))
(is (= 1 (mc/count collection))) (is (= 1 (mc/count collection)))
(is (= (modified-doc (mc/find-by-id collection doc-id)))) (is (= (modified-doc (mc/find-by-id collection doc-id))))
(mc/remove collection))) (mc/remove collection)))
@ -156,9 +156,10 @@
date (Date.) date (Date.)
doc {:created-at date :data-store "MongoDB" :language "Clojure" :_id doc-id} doc {:created-at date :data-store "MongoDB" :language "Clojure" :_id doc-id}
modified-doc {:created-at date :data-store "MongoDB" :language "Erlang" :_id doc-id}] modified-doc {:created-at date :data-store "MongoDB" :language "Erlang" :_id doc-id}]
(is (not (monger.result/updated-existing? (mc/upsert collection {:language "Clojure"} doc)))) (mc/remove collection)
(is (not (mr/updated-existing? (mc/upsert collection {:language "Clojure"} doc))))
(is (= 1 (mc/count collection))) (is (= 1 (mc/count collection)))
(is (monger.result/updated-existing? (mc/upsert collection {:language "Clojure"} modified-doc :multi false))) (is (mr/updated-existing? (mc/upsert collection {:language "Clojure"} modified-doc :multi false)))
(is (= 1 (mc/count collection))) (is (= 1 (mc/count collection)))
(is (= (modified-doc (mc/find-by-id collection doc-id)))) (is (= (modified-doc (mc/find-by-id collection doc-id))))
(mc/remove collection))) (mc/remove collection)))