From 2abe12800829212793dc21c5fa26a974d2665b65 Mon Sep 17 00:00:00 2001
From: Juvenn Woo <machese@gmail.com>
Date: Fri, 9 Mar 2018 11:54:14 +0800
Subject: [PATCH 1/2] Support register customized parameterizer

---
 src/honeysql/format.cljc       | 11 +++++++++++
 test/honeysql/format_test.cljc | 16 +++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/honeysql/format.cljc b/src/honeysql/format.cljc
index 78eddf7..e17f577 100644
--- a/src/honeysql/format.cljc
+++ b/src/honeysql/format.cljc
@@ -56,6 +56,17 @@
    :jdbc (constantly "?")
    :none #(str (last @*params*))})
 
+(defn register-parameterizer
+  "Register f as a customized parameterizer.
+   E.g.:
+   (register-parameterizer :single-quote #(str \"'\" % \"'\"))
+   (format sql-map :parameterizer :single-quote)"
+  [k f]
+  (alter-var-root
+   #'parameterizers
+   (fn [m]
+     (assoc m k #(f (last @*params*))))))
+
 (def ^:dynamic *quote-identifier-fn* nil)
 (def ^:dynamic *parameterizer* nil)
 
diff --git a/test/honeysql/format_test.cljc b/test/honeysql/format_test.cljc
index 84d7fc5..2976fce 100644
--- a/test/honeysql/format_test.cljc
+++ b/test/honeysql/format_test.cljc
@@ -4,7 +4,8 @@
                  :cljs [cljs.test :refer-macros]) [deftest testing is are]]
             [honeysql.types :as sql]
             [honeysql.format :refer
-             [*allow-dashed-names?* quote-identifier format-clause format]]))
+             [*allow-dashed-names?* quote-identifier format-clause format
+              register-parameterizer]]))
 
 (deftest test-quote
   (are
@@ -174,3 +175,16 @@
     (is (= (format {:where [:and [:= :foo "foo"] [:= :bar "bar"] nil]}
                    :parameterizer :postgresql)
            ["WHERE (foo = $1 AND bar = $2)" "foo" "bar"]))))
+
+(register-parameterizer :single-quote #(str \' % \'))
+(register-parameterizer :mysql-fill (constantly "?"))
+
+(deftest customized-parameterizer
+  (testing "should fill param with single quote"
+    (is (= (format {:where [:and [:= :foo "foo"] [:= :bar "bar"] nil]}
+                   :parameterizer :single-quote)
+           ["WHERE (foo = 'foo' AND bar = 'bar')" "foo" "bar"])))
+  (testing "should fill param with ?"
+    (is (= (format {:where [:and [:= :foo "foo"] [:= :bar "bar"] nil]}
+                   :parameterizer :mysql-fill)
+           ["WHERE (foo = ? AND bar = ?)" "foo" "bar"]))))

From e874a6114d20fa7dbc9cddaa17b77d060fa7743c Mon Sep 17 00:00:00 2001
From: Juvenn Woo <machese@gmail.com>
Date: Fri, 9 Mar 2018 14:11:50 +0800
Subject: [PATCH 2/2] Replace alter-var-root with atom for parameterizers

---
 src/honeysql/format.cljc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/honeysql/format.cljc b/src/honeysql/format.cljc
index e17f577..b952ce2 100644
--- a/src/honeysql/format.cljc
+++ b/src/honeysql/format.cljc
@@ -52,9 +52,10 @@
    :oracle #(str \" (string/replace % "\"" "\"\"") \")})
 
 (def ^:private parameterizers
-  {:postgresql #(str "$" (swap! *all-param-counter* inc))
+  (atom
+   {:postgresql #(str "$" (swap! *all-param-counter* inc))
    :jdbc (constantly "?")
-   :none #(str (last @*params*))})
+   :none #(str (last @*params*))}))
 
 (defn register-parameterizer
   "Register f as a customized parameterizer.
@@ -62,8 +63,8 @@
    (register-parameterizer :single-quote #(str \"'\" % \"'\"))
    (format sql-map :parameterizer :single-quote)"
   [k f]
-  (alter-var-root
-   #'parameterizers
+  (swap!
+   parameterizers
    (fn [m]
      (assoc m k #(f (last @*params*))))))
 
@@ -265,7 +266,7 @@
               *param-names* (atom [])
               *input-params* (atom params)
               *quote-identifier-fn* (quote-fns (:quoting opts))
-              *parameterizer* (parameterizers (or (:parameterizer opts) :jdbc))
+              *parameterizer* (@parameterizers (or (:parameterizer opts) :jdbc))
               *allow-dashed-names?* (:allow-dashed-names? opts)]
       (let [sql-str (to-sql sql-map)]
         (if (and (seq @*params*) (not= :none (:parameterizer opts)))