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

Make it possible to opt-out of field keywordization in the query DSL

Browse source 
An example:

``` clojure
(with-collection coll
  (find {})
  (limit 3)
  (sort { :population -1 })
  (keywordize-fields false))
```
This commit is contained in:
Michael S. Klishin 2012-02-12 10:13:39 +04:00
parent c04df6e58c
commit fe421cc0db
2 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/monger/query.clj
View file

@ -36,14 +36,15 @@
(defn empty-query (defn empty-query
([] ([]
{ {
:query {} :query {}
:sort {} :sort {}
:fields [] :fields []
:skip 0 :skip 0
:limit 0 :limit 0
:batch-size 256 :batch-size 256
:hint nil :hint nil
:snapshot false :snapshot false
:keywordize-fields true
}) })
([^DBCollection coll] ([^DBCollection coll]
(merge (empty-query) { :collection coll }))) (merge (empty-query) { :collection coll })))
@ -53,7 +54,7 @@
(to-db-object (zipmap fields (repeat 1)))) (to-db-object (zipmap fields (repeat 1))))
(defn exec (defn exec
[{ :keys [collection query fields skip limit sort batch-size hint snapshot read-preference] :or { limit 0 batch-size 256 skip 0 } }] [{ :keys [collection query fields skip limit sort batch-size hint snapshot read-preference keywordize-fields] :or { limit 0 batch-size 256 skip 0 } }]
(let [cursor (doto ^DBCursor (.find ^DBCollection collection (to-db-object query) (fields-to-db-object fields)) (let [cursor (doto ^DBCursor (.find ^DBCollection collection (to-db-object query) (fields-to-db-object fields))
(.limit limit) (.limit limit)
(.skip skip) (.skip skip)
@ -64,7 +65,7 @@
(.snapshot cursor)) (.snapshot cursor))
(when read-preference (when read-preference
(.setReadPreference cursor read-preference)) (.setReadPreference cursor read-preference))
(map (fn [x] (from-db-object x true)) (map (fn [x] (from-db-object x keywordize-fields))
(seq cursor)))) (seq cursor))))
;; ;;
@ -107,6 +108,10 @@
[m ^ReadPreference rp] [m ^ReadPreference rp]
(merge m { :read-preference rp })) (merge m { :read-preference rp }))
(defn keywordize-fields
[m bool]
(merge m { :keywordize-fields bool }))
(defn paginate (defn paginate
[m & { :keys [page per-page] :or { page 1 per-page 10 } }] [m & { :keys [page per-page] :or { page 1 per-page 10 } }]
(merge m { :limit per-page :skip (monger.internal.pagination/offset-for page per-page) })) (merge m { :limit per-page :skip (monger.internal.pagination/offset-for page per-page) }))

20
test/monger/test/querying.clj
View file

@ -260,3 +260,23 @@
(merge top3) (merge top3)
(merge by-population-desc))] (merge by-population-desc))]
(is (= result [ca-doc tx-doc ny-doc])))) (is (= result [ca-doc tx-doc ny-doc]))))
(deftest combined-querying-dsl-example2
(let [coll "docs"
ma-doc { :_id (ObjectId.) :name "Massachusetts" :iso "MA" :population 6547629 :joined_in 1788 :capital "Boston" }
de-doc { :_id (ObjectId.) :name "Delaware" :iso "DE" :population 897934 :joined_in 1787 :capital "Dover" }
ny-doc { :_id (ObjectId.) :name "New York" :iso "NY" :population 19378102 :joined_in 1788 :capital "Albany" }
ca-doc { :_id (ObjectId.) :name "California" :iso "CA" :population 37253956 :joined_in 1850 :capital "Sacramento" }
tx-doc { :_id (ObjectId.) :name "Texas" :iso "TX" :population 25145561 :joined_in 1845 :capital "Austin" }
top3 (partial-query (limit 3))
by-population-desc (partial-query (sort { :population -1 }))
_ (mgcol/insert-batch coll [ma-doc de-doc ny-doc ca-doc tx-doc])
result (with-collection coll
(find {})
(merge top3)
(merge by-population-desc)
(keywordize-fields false))]
;; documents have fields as strings,
;; not keywords
(is (= (map #(% "name") result)
(map #(% :name) [ca-doc tx-doc ny-doc])))))