Always default :identifiers to u/lower-case (#74)

If we don't, and options are set via `db/set-default-jdbc-options!`,
clojure.jdbc will default back to locale-aware
`clojure.string/lower-case`. Unless the user specifies something else,
`u/lower-case` is always preferable.

Author: walterl

src/toucan/db.clj

@@ -105,15 +105,18 @@
   [db-connection-map]
   (reset! default-db-connection db-connection-map))
 
-(defonce ^:private default-jdbc-options
+(defonce ^:private default-default-jdbc-options
   ;; FIXME: This has already been fixed in `clojure.java.jdbc`, so
   ;;        this option can be removed when using >= 0.7.10.
-  (atom {:identifiers u/lower-case}))
+  {:identifiers u/lower-case})
+
+(defonce ^:private default-jdbc-options
+  (atom default-default-jdbc-options))
 
 (defn set-default-jdbc-options!
   "Set the default options to be used for all calls to `clojure.java.jdbc/query` or `execute!`."
   [jdbc-options]
-  (reset! default-jdbc-options jdbc-options))
+  (reset! default-jdbc-options (merge default-default-jdbc-options jdbc-options)))
 
 
 

test/toucan/db_test.clj

@@ -1,10 +1,12 @@
 (ns toucan.db-test
   (:require [clojure.java.jdbc :as jdbc]
+            [clojure.string :as str]
             [expectations :refer :all]
             [honeysql.core :as hsql]
             [toucan
              [db :as db]
-             [test-setup :as test]]
+             [test-setup :as test]
+             [util :as u]]
             [toucan.test-models
              [address :refer [Address]]
              [category :refer [Category]]
@@ -57,6 +59,34 @@
   (binding [db/*automatically-convert-dashes-and-underscores* true]
     (db/select-one-field :street-name Address)))
 
+;; Ensure that (:identifiers @default-jdbc-options) defaults to `u/lower-case`
+(defn- mangle-a-chars
+  [s]
+  (-> s u/lower-case (str/replace "a" "â")))
+
+(expect
+  [mangle-a-chars #{:first-nâme :lâst-nâme :id}] ; Note the circumflexes over a's
+  (let [original-options @@(var db/default-jdbc-options)]
+    (try
+      (db/set-default-jdbc-options! {:identifiers mangle-a-chars})
+      [(:identifiers @@(var db/default-jdbc-options))
+       (-> (db/select-one 'User) keys set)]
+      (finally
+        (db/set-default-jdbc-options! original-options)))))
+
+(expect
+  [u/lower-case #{:first-name :last-name :id}] ; Note the absence of circumflexes over a's
+  (let [original-options @@(var db/default-jdbc-options)]
+    (try
+      (db/set-default-jdbc-options! {:identifiers mangle-a-chars})
+      ;; Setting default options without `:identifiers` should default to u/lower-case. If it doesn't, we can expect
+      ;; either the current value `mangle-a-chars` (:identifiers wasn't updated), or nil (overwritten).
+      (db/set-default-jdbc-options! {})
+      [(:identifiers @@(var db/default-jdbc-options))
+       (-> (db/select-one 'User) keys set)]
+      (finally
+        (db/set-default-jdbc-options! original-options)))))
+
 ;; Test replace-underscores
 (expect
  :2-cans