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

Make sure monger.collection/find-by-id and /find-map-by-id fail fast when id is nil

Browse source
This commit is contained in:
Michael S. Klishin 2012-02-13 22:52:03 +04:00
parent 7553925250
commit f6a80fa40a
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/monger/collection.clj
View file

@ -15,6 +15,20 @@
(:require [monger core result]) (:require [monger core result])
(:use [monger.conversion])) (:use [monger.conversion]))
;;
;; Implementation
;;
(defn- fields-to-db-object
[^List fields]
(zipmap fields (repeat 1)))
(definline check-not-nil!
[ref message]
`(when (nil? ~ref)
(throw (IllegalArgumentException. ~message))))
;; ;;
;; API ;; API
;; ;;
@ -66,7 +80,6 @@
;; ;;
;; monger.collection/find ;; monger.collection/find
;; ;;
(declare fields-to-db-object)
(defn ^DBCursor find (defn ^DBCursor find
"Queries for objects in this collection. "Queries for objects in this collection.
@ -178,19 +191,25 @@
(mgcol/find-one-by-id collection (ObjectId. \"4ef45ab4744e9fd632640e2d\") [:language]) (mgcol/find-one-by-id collection (ObjectId. \"4ef45ab4744e9fd632640e2d\") [:language])
" "
([^String collection id] ([^String collection id]
(check-not-nil! id "id must not be nil")
(find-one collection { :_id id })) (find-one collection { :_id id }))
([^String collection id ^List fields] ([^String collection id ^List fields]
(check-not-nil! id "id must not be nil")
(find-one collection { :_id id } fields)) (find-one collection { :_id id } fields))
([^DB db ^String collection id ^List fields] ([^DB db ^String collection id ^List fields]
(check-not-nil! id "id must not be nil")
(find-one db collection { :_id id } fields))) (find-one db collection { :_id id } fields)))
(defn ^IPersistentMap find-map-by-id (defn ^IPersistentMap find-map-by-id
"Returns a single object, converted to map with matching _id field." "Returns a single object, converted to map with matching _id field."
([^String collection id] ([^String collection id]
(check-not-nil! id "id must not be nil")
(from-db-object ^DBObject (find-one-as-map collection { :_id id }) true)) (from-db-object ^DBObject (find-one-as-map collection { :_id id }) true))
([^String collection id keywordize] ([^String collection id keywordize]
(check-not-nil! id "id must not be nil")
(from-db-object ^DBObject (find-one-as-map collection { :_id id }) keywordize)) (from-db-object ^DBObject (find-one-as-map collection { :_id id }) keywordize))
([^String collection id ^List fields keywordize] ([^String collection id ^List fields keywordize]
(check-not-nil! id "id must not be nil")
(from-db-object ^DBObject (find-one-as-map collection { :_id id } fields) keywordize))) (from-db-object ^DBObject (find-one-as-map collection { :_id id } fields) keywordize)))
@ -503,13 +522,3 @@
([^DB db ^String collection ^String key ^Map query] ([^DB db ^String collection ^String key ^Map query]
(let [^DBCollection coll (.getCollection db collection)] (let [^DBCollection coll (.getCollection db collection)]
(.distinct coll ^String (to-db-object key) ^DBObject (to-db-object query))))) (.distinct coll ^String (to-db-object key) ^DBObject (to-db-object query)))))
;;
;; Implementation
;;
(defn- fields-to-db-object
[^List fields]
(zipmap fields (repeat 1)))

11
test/monger/test/regular_finders.clj
View file

@ -101,6 +101,11 @@
doc-id (monger.util/random-uuid)] doc-id (monger.util/random-uuid)]
(is (nil? (mgcol/find-by-id collection doc-id))))) (is (nil? (mgcol/find-by-id collection doc-id)))))
(deftest find-full-document-by-string-id-when-id-is-nil
(let [collection "libraries"
doc-id nil]
(is (thrown? IllegalArgumentException (mgcol/find-by-id collection doc-id)))))
(deftest find-full-document-by-object-id-when-that-document-does-not-exist (deftest find-full-document-by-object-id-when-that-document-does-not-exist
(let [collection "libraries" (let [collection "libraries"
doc-id (ObjectId.)] doc-id (ObjectId.)]
@ -111,6 +116,12 @@
doc-id (monger.util/random-uuid)] doc-id (monger.util/random-uuid)]
(is (nil? (mgcol/find-map-by-id collection doc-id))))) (is (nil? (mgcol/find-map-by-id collection doc-id)))))
(deftest find-full-document-by-id-as-map-when-id-is-nil
(let [collection "libraries"
doc-id nil]
(is (thrown? IllegalArgumentException
(mgcol/find-map-by-id collection doc-id)))))
(deftest find-full-document-by-string-id-when-document-does-exist (deftest find-full-document-by-string-id-when-document-does-exist
(let [collection "libraries" (let [collection "libraries"