Query database should take precedence over current connection

src/korma/db.clj

@@ -260,8 +260,15 @@
                *current-conn* conn#]
        ~@body)))
 
+(defn- use-current-conn? [db]
+  "Returns true if the current connection should be used
+  instead of the given db spec"
+  (and *current-conn*
+       (or (nil? db)
+           (identical? db *current-db*))))
+
 (defn do-query [{:keys [db] :as query}]
-  (if *current-conn*
+  (if (use-current-conn? db)
     (exec-sql query)
     (with-db (or db @_default)
       (exec-sql query))))

test/korma/test/integration/per_query_database.clj

@@ -35,4 +35,13 @@
   (is (= [{:id 1 :name "Chris" :email [{:id 1 :user_id 1 :email_address "chris@email.com"}]}]
          (select user
            (database mem-db)
-           (with email)))))
+           (with email)))))
+
+(deftest per-query-database-takes-precedence
+  (let [other-db (create-db (h2 {:db "mem:query_other_database"}))]
+    (is (= [{:id 1 :name "Chris" :email [{:id 1 :user_id 1 :email_address "chris@email.com"}]}]
+         (with-db other-db
+           (dorun (map exec-raw schema))
+           (select user
+             (database mem-db)
+             (with email)))))))