Sync with upstream

src/clojure/monger/cursor.clj

@@ -6,7 +6,8 @@
             [java.util List Map]
             [java.lang Integer]
             [clojure.lang Keyword])
-  (:require [monger.conversion :refer [to-db-object from-db-object as-field-selector]]))
+  (:require [monger.core]
+            [monger.conversion :refer [to-db-object from-db-object as-field-selector]]))
 
 (defn ^DBCursor make-db-cursor 
   "initializes new db-cursor."

src/clojure/monger/query.clj

@@ -26,8 +26,6 @@
 ;; Implementation
 ;;
 
-(def ^{:dynamic true} *query-collection*)
-
 ;;
 ;; Cursor/chain methods
 ;;
@@ -135,11 +133,12 @@
 
 (defmacro with-collection
   [^String coll & body]
-  `(binding [*query-collection* (if (string? ~coll)
-                                  (.getCollection ^DB monger.core/*mongodb-database* ~coll)
-                                  ~coll)]
-     (let [query# (-> (empty-query *query-collection*) ~@body)]
-       (exec query#))))
+  `(let [coll# ~coll
+         db-coll# (if (string? coll#)
+                    (.getCollection ^DB monger.core/*mongodb-database* ^String coll#)
+                    coll#)
+         query# (-> (empty-query db-coll#) ~@body)]
+     (exec query#)))
 
 (defmacro partial-query
   [& body]