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

keyword syntax for sql calls

Browse source
This commit is contained in:
Justin Kramer 2013-08-06 14:05:17 -04:00
parent f9f2087163
commit 96ddbc18f4
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.md
View file

@ -91,17 +91,23 @@ Queries can be nested:
=> ["SELECT * FROM foo WHERE (foo.a IN (SELECT a FROM bar))"] => ["SELECT * FROM foo WHERE (foo.a IN (SELECT a FROM bar))"]
``` ```
There are helper functions and data literals for field qualifiers, SQL function Keywords that begin with `%` are interpreted as SQL function calls:
calls, raw SQL fragments, and named input parameters:
```clj ```clj
(-> (select (sql/qualify :foo :a) (sql/call :count :*) (sql/raw "@var := foo.bar")) (-> (select :%count.*) (from :foo) sql/format)
=> ["SELECT COUNT(*) FROM foo"]
```
There are helper functions and data literals for SQL function calls, field qualifiers, raw SQL fragments, and named input parameters:
```clj
(-> (select (sql/call :foo :bar) (sql/qualify :foo :a) (sql/raw "@var := foo.bar"))
(from :foo) (from :foo)
(where [:= :a (sql/param :baz)])) (where [:= :a (sql/param :baz)]))
=> {:where [:= :a #sql/param :baz], :from (:foo), :select (#sql/call [:count :*] #sql/raw "@var := foo.bar")} => {:where [:= :a #sql/param :baz], :from (:foo), :select (#sql/call [:foo :bar] :foo.a #sql/raw "@var := foo.bar")}
(sql/format *1 {:baz "BAZ"}) (sql/format *1 {:baz "BAZ"})
=> ["SELECT COUNT(*), @var := foo.bar FROM foo WHERE a = ?" "BAZ"] => ["SELECT FOO(bar), foo.a, @var := foo.bar FROM foo WHERE a = ?" "BAZ"]
``` ```
Here's a big, complicated query. Note that Honey SQL makes no attempt to verify that your queries make any sense. It merely renders surface syntax. Here's a big, complicated query. Note that Honey SQL makes no attempt to verify that your queries make any sense. It merely renders surface syntax.

6
src/honeysql/format.clj
View file

@ -154,7 +154,11 @@
(extend-protocol ToSql (extend-protocol ToSql
clojure.lang.Keyword clojure.lang.Keyword
(-to-sql [x] (-> x name (string/replace "-" "_"))) (-to-sql [x] (let [s ^String (name x)]
(if (= \% (.charAt s 0))
(let [call-args (string/split (subs s 1) #"\." 2)]
(to-sql (apply call (map keyword call-args))))
(-> s (string/replace "-" "_")))))
clojure.lang.Symbol clojure.lang.Symbol
(-to-sql [x] (-> x name (string/replace "-" "_"))) (-to-sql [x] (-> x name (string/replace "-" "_")))
java.lang.Number java.lang.Number

4
test/honeysql/core_test.clj
View file

@ -8,7 +8,7 @@
(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"]
(sql/call :now) (sql/raw "@x := 10")) :%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])
@ -27,7 +27,7 @@
(limit 50) (limit 50)
(offset 10)) (offset 10))
m2 {:select [:f.* :b.baz :c.quux [:b.bla "bla-bla"] m2 {:select [:f.* :b.baz :c.quux [:b.bla "bla-bla"]
(sql/call :now) (sql/raw "@x := 10")] :%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]]