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

minor refactoring

Browse source
This commit is contained in:
Unnikrishnan 2016-04-05 09:26:27 +05:30
parent 21b4cea2c2
commit 36d13d32dc
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/honeysql/format.clj
View file

@ -17,13 +17,14 @@
(defn paren-wrap [x]
(str "(" x ")"))
;; Checks if the first is a `DISTINCT ON` statement, if yes then return a string
;; with an appended space at the end of the first and then comma joining the rest
;; else simply return a comma joined string
;; Checks if the first elemnet of the list is a `DISTINCT ON` statement, if yes
;; then return a string with an appended space at the end of the first and then
;; comma joining the rest else simply return a comma joined string
(defn construct-select [s]
(if (re-find #"DISTINCT ON" (first s))
(str (first s) " " (comma-join (rest s)))
(comma-join s)))
(let [[fst & rst] s]
(if (re-find #"DISTINCT ON" fst)
(str fst " " (comma-join rst))
(comma-join s))))
(def ^:dynamic *clause*
"During formatting, *clause* is bound to :select, :from, :where, etc."

2
test/honeysql/core_test.clj
View file

@ -175,7 +175,7 @@
sql/format)))))
(deftest distinct-on
(testing "Distinct on"
(testing "Distinct on query generation"
(is (= ["SELECT DISTINCT ON (name) name, created_by"]
(-> (select (sql/call :distinct-on :name) :name :created_by)
sql/format)))