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

always pipe base map through build, to ensure consistency

Browse source
This commit is contained in:
Justin Kramer 2012-08-24 17:08:22 -04:00
parent 18d5fa19e8
commit cfadae53d1
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/honeysql/core.clj
View file

@ -17,5 +17,7 @@
(reduce (reduce
(fn [sql-map [op args]] (fn [sql-map [op args]]
(build-clause op sql-map args)) (build-clause op sql-map args))
(if (empty? base)
base base
(apply build (apply concat base)))
(partition 2 clauses)))) (partition 2 clauses))))

36
test/honeysql/core_test.clj
View file

@ -1,15 +1,15 @@
(ns honeysql.core-test (ns honeysql.core-test
(:refer-clojure :exclude [format]) (:refer-clojure :exclude [format])
(:require [clojure.test :refer [deftest testing is]] (:require [clojure.test :refer [deftest testing is]]
[honeysql.core :refer :all] [honeysql.core :as sql]
[honeysql.helpers :refer :all])) [honeysql.helpers :refer :all]))
;; TODO: more tests ;; TODO: more tests
(deftest test-select (deftest test-select
(let [m1 (-> (select :f.* :b.baz :c.quux [:b.bla "bla-bla"] (let [m1 (-> (select :f.* :b.baz :c.quux [:b.bla "bla-bla"]
(call :now) (raw "@x := 10")) (sql/call :now) (sql/raw "@x := 10"))
(un-select :c.quux) ;;(un-select :c.quux)
(modifiers :distinct) (modifiers :distinct)
(from [:foo :f] [:baz :b]) (from [:foo :f] [:baz :b])
(join [[:clod :c] [:= :f.a :c.d] :left] (join [[:clod :c] [:= :f.a :c.d] :left]
@ -19,14 +19,36 @@
[:< 1 2 3] [:< 1 2 3]
[:in :f.e [1 2 3]] [:in :f.e [1 2 3]]
[:between :f.e 10 20]]) [:between :f.e 10 20]])
(merge-where [:not= nil :b.bla]) ;;(merge-where [:not= nil :b.bla])
(group :f.a) (group :f.a)
(having [:< 0 :f.e]) (having [:< 0 :f.e])
(order-by [:b.baz :desc] :c.quux) (order-by [:b.baz :desc] :c.quux)
(limit 50) (limit 50)
(offset 10))] (offset 10))
m2 {:select [:f.* :b.baz :c.quux [:b.bla "bla-bla"]
(sql/call :now) (sql/raw "@x := 10")]
;;:un-select :c.quux
:modifiers :distinct
:from [[:foo :f] [:baz :b]]
:join [[[:clod :c] [:= :f.a :c.d] :left]
[:draq [:= :f.b :draq.x]]]
:where [:or
[:and [:= :f.a "bort"] [:not= :b.baz "gabba"]]
[:< 1 2 3]
[:in :f.e [1 2 3]]
[:between :f.e 10 20]]
;;:merge-where [:not= nil :b.bla]
:group-by :f.a
:having [:< 0 :f.e]
:order-by [[:b.baz :desc] :c.quux]
:limit 50
:offset 10}
m3 (sql/build m2)
m4 (apply sql/build (apply concat m2))]
(testing "Various construction methods are consistent"
(is (= m1 m3)))
(testing "SQL data formats correctly" (testing "SQL data formats correctly"
(is (= (format m1) (is (= (sql/format m1)
["SELECT DISTINCT f.*, b.baz, b.bla AS \"bla-bla\", NOW(), @x := 10 FROM foo AS f, baz AS b LEFT JOIN clod AS c ON f.a = c.d JOIN draq ON f.b = draq.x WHERE (((f.a = ? AND b.baz <> ?) OR (1 < 2 AND 2 < 3) OR (f.e IN (1, 2, 3)) OR f.e BETWEEN 10 AND 20) AND b.bla IS NOT NULL) GROUP BY f.a HAVING 0 < f.e ORDER BY b.baz DESC, c.quux LIMIT 50 OFFSET 10" "bort" "gabba"]))) ["SELECT DISTINCT f.*, b.baz, c.quux, b.bla AS \"bla-bla\", NOW(), @x := 10 FROM foo AS f, baz AS b LEFT JOIN clod AS c ON f.a = c.d JOIN draq ON f.b = draq.x WHERE ((f.a = ? AND b.baz <> ?) OR (1 < 2 AND 2 < 3) OR (f.e IN (1, 2, 3)) OR f.e BETWEEN 10 AND 20) GROUP BY f.a HAVING 0 < f.e ORDER BY b.baz DESC, c.quux LIMIT 50 OFFSET 10" "bort" "gabba"])))
(testing "SQL data prints and reads correctly" (testing "SQL data prints and reads correctly"
(is (= m1 (read-string (pr-str m1))))))) (is (= m1 (read-string (pr-str m1)))))))