luciano/honeysql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement base clause order for more predictable dialect selection

Browse source
This commit is contained in:
Sean Corfield 2020-09-24 11:13:08 -07:00
parent ba701b60cd
commit 6cf8fa9e45
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/honey/sql.cljc
View file

@ -292,8 +292,16 @@
xs)] xs)]
(into [(str (sql-kw k) " " (str/join ", " sqls))] params))) (into [(str (sql-kw k) " " (str/join ", " sqls))] params)))
(def ^:private base-clause-order
"The (base) order for known clauses. Can have items added and removed.
This is the 'pre-dialect' ordering."
(atom default-clause-order))
(def ^:private current-clause-order (def ^:private current-clause-order
"The (current) order for known clauses. Can have items added and removed." "The (current) order for known clauses. Can have items added and removed.
This is the 'post-dialect` ordering when a new default dialect is set."
(atom default-clause-order)) (atom default-clause-order))
(def ^:private clause-format (def ^:private clause-format
@ -329,7 +337,9 @@
:offset #'format-on-expr :offset #'format-on-expr
:values #'format-values})) :values #'format-values}))
(assert (= (set @current-clause-order) (set (keys @clause-format)))) (assert (= (set @base-clause-order)
(set @current-clause-order)
(set (keys @clause-format))))
(comment :target (comment :target
{;:with 20 {;:with 20
@ -502,7 +512,7 @@
(binding [*dialect* (if dialect? dialect @default-dialect) (binding [*dialect* (if dialect? dialect @default-dialect)
*clause-order* (if dialect? *clause-order* (if dialect?
(if-let [f (:clause-order-fn dialect)] (if-let [f (:clause-order-fn dialect)]
(f @current-clause-order) (f @base-clause-order)
@current-clause-order) @current-clause-order)
@current-clause-order) @current-clause-order)
*quoted* (if (contains? opts :quoted) *quoted* (if (contains? opts :quoted)
@ -513,17 +523,28 @@
(defn set-dialect! (defn set-dialect!
"Set the default dialect for formatting. "Set the default dialect for formatting.
Can be: `:ansi` (the default), `:mssql`, `:mysql`." Can be: `:ansi` (the default), `:mssql`, `:mysql`.
Dialects are always applied to the base order to create the current order."
[dialect] [dialect]
(reset! default-dialect (get dialects (check-dialect dialect))) (reset! default-dialect (get dialects (check-dialect dialect)))
(when-let [f (:clause-order-fn @default-dialect)] (when-let [f (:clause-order-fn @default-dialect)]
(swap! current-clause-order f))) (reset! current-clause-order (f @base-clause-order))))
(defn register-clause! (defn register-clause!
"Register a new clause formatter. If `before` is `nil`, the clause is "Register a new clause formatter. If `before` is `nil`, the clause is
added to the end of the list of known clauses, otherwise it is inserted added to the end of the list of known clauses, otherwise it is inserted
immediately prior to that clause." immediately prior to that clause.
New clauses are registered in the base order and the current order so
that any dialect selections are able to include them while still working
predictably from the base order. Caveat: that means if you are a new
clause `before` a clause that is ordered differently in different
dialects, your new clause may also end up in a different place. The
only clause so far where that would matter is `:set` which differs in
MySQL..."
[clause formatter before] [clause formatter before]
(swap! base-clause-order add-clause-before clause before)
(swap! current-clause-order add-clause-before clause before) (swap! current-clause-order add-clause-before clause before)
(swap! clause-format assoc clause formatter)) (swap! clause-format assoc clause formatter))