Address Turkish lower-case issue

seancorfield · seancorfield · commit 1f1ff8144b4a · 2019-08-08T17:08:41.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,6 @@
 Changes coming in 0.7.10
 
+* Use a US-locale `lower-case` function to avoid problems in certain locales (e.g., Turkish). A similar issue has been fixed recently in both HoneySQL and `next.jdbc`.
 * Clean up `db-spec` options that are passed to the JDBC connection manager as properties [JDBC-178](https://clojure.atlassian.net/browse/JDBC-178).
 * Relax restriction on `create-table-ddl` column specs to allow numbers (as well as keywords and strings) [JDBC-177](https://clojure.atlassian.net/browse/JDBC-177).
 
diff --git a/src/main/clojure/clojure/java/jdbc.clj b/src/main/clojure/clojure/java/jdbc.clj
@@ -45,7 +45,7 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
            (java.sql BatchUpdateException DriverManager
                      PreparedStatement ResultSet ResultSetMetaData
                      SQLException Statement Types)
-           (java.util Hashtable Map Properties)
+           (java.util Hashtable Locale Map Properties)
            (javax.sql DataSource)))
 
 (set! *warn-on-reflection* true)
@@ -535,6 +535,13 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
         :else
         identifiers))
 
+(defn- lower-case
+  "Converts a string to lower case in the US locale to avoid problems in
+  locales where the lower case version of a character is not a valid SQL
+  entity name (e.g., Turkish)."
+  [^String s]
+  (.toLowerCase s (Locale/US)))
+
 (defn result-set-seq
   "Creates and returns a lazy sequence of maps corresponding to the rows in the
   java.sql.ResultSet rs. Loosely based on clojure.core/resultset-seq but it
@@ -551,7 +558,7 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
   ([rs] (result-set-seq rs {}))
   ([^ResultSet rs {:keys [as-arrays? identifiers keywordize?
                           qualifier read-columns]
-                   :or {identifiers str/lower-case
+                   :or {identifiers lower-case
                         keywordize? true
                         read-columns dft-read-columns}}]
    (let [rsmeta (.getMetaData rs)
@@ -1213,7 +1220,7 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
   Compiled with Clojure 1.7 or later -- uses clojure.lang.IReduce
   Note: :as-arrays? is not accepted here."
   [^ResultSet rs {:keys [identifiers keywordize? qualifier read-columns]
-                  :or {identifiers str/lower-case
+                  :or {identifiers lower-case
                        keywordize? true
                        read-columns dft-read-columns}}]
   (let [rsmeta (.getMetaData rs)
@@ -1312,7 +1319,7 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
   ([db sql-params] (reducible-query db sql-params {}))
   ([db sql-params opts]
    (let [{:keys [identifiers keywordize? qualifier read-columns] :as opts}
-         (merge {:identifiers str/lower-case :keywordize? true
+         (merge {:identifiers lower-case :keywordize? true
                  :read-columns dft-read-columns}
                 (when (map? db) db)
                 opts)
@@ -1551,7 +1558,7 @@ http://clojure-doc.org/articles/ecosystem/java_jdbc/home.html"}
   map, insert the rows into the database."
   [db table rows opts]
   (let [{:keys [entities transaction?] :as opts}
-        (merge {:entities identity :identifiers str/lower-case
+        (merge {:entities identity :identifiers lower-case
                 :keywordize? true :transaction? true}
                (when (map? db) db)
                opts)
