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

Merge pull request #169 from MichaelBlume/fix-tuples

Browse source 
Revert #149 and restore tuple behavior
This commit is contained in:
Michael Blume 2017-07-18 13:47:56 -07:00 committed by GitHub
commit 3eaf5edbc0
2 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/honeysql/format.cljc
View file

@ -37,8 +37,6 @@
(def ^:dynamic *fn-context?* false)
(def ^:dynamic *value-context?* false)
(def ^:dynamic *subquery?* false)
(def ^:dynamic *allow-dashed-names?* false)
@ -96,10 +94,6 @@
(defprotocol ToSql
(to-sql [x]))
(defn to-sql-value [x]
(binding [*value-context?* true]
(to-sql x)))
(defmulti fn-handler (fn [op & args] op))
(defn expand-binary-ops [op & args]
@ -130,40 +124,40 @@
(if (seq more)
(apply expand-binary-ops "=" a b more)
(cond
(nil? a) (str (to-sql-value b) " IS NULL")
(nil? b) (str (to-sql-value a) " IS NULL")
:else (str (to-sql-value a) " = " (to-sql-value b)))))
(nil? a) (str (to-sql b) " IS NULL")
(nil? b) (str (to-sql a) " IS NULL")
:else (str (to-sql a) " = " (to-sql b)))))
(defmethod fn-handler "<>" [_ a b & more]
(if (seq more)
(apply expand-binary-ops "<>" a b more)
(cond
(nil? a) (str (to-sql-value b) " IS NOT NULL")
(nil? b) (str (to-sql-value a) " IS NOT NULL")
:else (str (to-sql-value a) " <> " (to-sql-value b)))))
(nil? a) (str (to-sql b) " IS NOT NULL")
(nil? b) (str (to-sql a) " IS NOT NULL")
:else (str (to-sql a) " <> " (to-sql b)))))
(defmethod fn-handler "<" [_ a b & more]
(if (seq more)
(apply expand-binary-ops "<" a b more)
(str (to-sql-value a) " < " (to-sql-value b))))
(str (to-sql a) " < " (to-sql b))))
(defmethod fn-handler "<=" [_ a b & more]
(if (seq more)
(apply expand-binary-ops "<=" a b more)
(str (to-sql-value a) " <= " (to-sql-value b))))
(str (to-sql a) " <= " (to-sql b))))
(defmethod fn-handler ">" [_ a b & more]
(if (seq more)
(apply expand-binary-ops ">" a b more)
(str (to-sql-value a) " > " (to-sql-value b))))
(str (to-sql a) " > " (to-sql b))))
(defmethod fn-handler ">=" [_ a b & more]
(if (seq more)
(apply expand-binary-ops ">=" a b more)
(str (to-sql-value a) " >= " (to-sql-value b))))
(str (to-sql a) " >= " (to-sql b))))
(defmethod fn-handler "between" [_ field lower upper]
(str (to-sql-value field) " BETWEEN " (to-sql-value lower) " AND " (to-sql-value upper)))
(str (to-sql field) " BETWEEN " (to-sql lower) " AND " (to-sql upper)))
;; Handles MySql's MATCH (field) AGAINST (pattern). The third argument
;; can be a set containing one or more of :boolean, :natural, or :expand.
@ -172,7 +166,7 @@
(comma-join
(map to-sql (if (coll? fields) fields [fields])))
") AGAINST ("
(to-sql-value pattern)
(to-sql pattern)
(when (seq opts)
(str " " (space-join (for [opt opts]
(case opt
@ -319,17 +313,10 @@
(paren-wrap sql-str)
sql-str)))
(declare format-predicate*)
(defn seq->sql [x]
(cond
*value-context?*
;; sequences are operators/functions
(format-predicate* x)
*fn-context?*
(if *fn-context?*
;; list argument in fn call
(paren-wrap (comma-join (map to-sql x)))
:else
;; alias
(str (to-sql (first x))
; Omit AS in FROM, JOIN, etc. - Oracle doesn't allow it

10
test/honeysql/format_test.cljc
View file

@ -116,11 +116,11 @@
["SELECT amount, id, created_on FROM transactions UNION SELECT amount, id, created_on FROM (SELECT amount, id, created_on FROM other_transactions ORDER BY amount DESC LIMIT ?) ORDER BY amount ASC" 5]))))
(deftest compare-expressions-test
(testing "Sequences should be fns when in value/comparison spots"
(testing "sql/call should produce appropriate function calls"
(is (= ["SELECT foo FROM bar WHERE (col1 mod ?) = (col2 + ?)" 4 4]
(format {:select [:foo]
:from [:bar]
:where [:= [:mod :col1 4] [:+ :col2 4]]})))))
:where (sql/call := (sql/call :mod :col1 4) (sql/call :+ :col2 4))})))))
(deftest union-with-cte
(is (= (format {:union [{:select [:foo] :from [:bar1]}
@ -136,3 +136,9 @@
:with [[[:bar {:columns [:spam :eggs]}]
{:values [[1 2] [3 4] [5 6]]}]]})
["WITH bar (spam, eggs) AS (VALUES (?, ?), (?, ?), (?, ?)) SELECT foo FROM bar1 UNION ALL SELECT foo FROM bar2" 1 2 3 4 5 6])))
(deftest format-tuples
(is (= ["SELECT id FROM table WHERE (a, b) = (?, ?)" 1 2]
(format {:select [:id]
:from [:table]
:where [:= [:a :b] [1 2]]}))))