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

Merge 0ce17ccfcf into 88bc556578

Browse source
This commit is contained in:
Menthalion 2014-08-19 08:29:41 +00:00
commit 5704b9c561
2 changed files with 74 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/honeysql/format.clj
View file

@ -156,9 +156,9 @@
(def clause-order
"Determines the order that clauses will be placed within generated SQL"
[:select :insert-into :update :delete-from :columns :set :from :join
:left-join :right-join :where :group-by :having :order-by :limit :offset
:values :query-values])
[:select :insert-into :update :delete :delete-from :columns :set :from :join
:left-join :right-join :where :aggregate :over :partition-by :group-by :having
:order-by :limit :offset :values :query-values])
(def known-clauses (set clause-order))
@ -386,3 +386,16 @@
(defmethod format-clause :delete-from [[_ table] _]
(str "DELETE FROM " (to-sql table)))
(defmethod format-clause :delete [[_ table] _]
(str "DELETE " (to-sql table)))
(defmethod format-clause :over [[_ part-clause] _]
(str "OVER " (to-sql part-clause)))
(defmethod format-clause :aggregate [[_ aggregate-fn] _]
(str (to-sql aggregate-fn)))
(defmethod format-clause :partition-by [[_ fields] _]
(str "PARTITION BY "
(comma-join (map to-sql fields))))

86
src/honeysql/helpers.clj
View file

@ -20,19 +20,19 @@
(if (coll? x) x [x]))
(defhelper select [m fields]
(assoc m :select (collify fields)))
(assoc m :select (collify fields)))
(defhelper merge-select [m fields]
(update-in m [:select] concat (collify fields)))
(update-in m [:select] concat (collify fields)))
(defhelper un-select [m fields]
(update-in m [:select] #(remove (set (collify fields)) %)))
(update-in m [:select] #(remove (set (collify fields)) %)))
(defhelper from [m tables]
(assoc m :from (collify tables)))
(assoc m :from (collify tables)))
(defhelper merge-from [m tables]
(update-in m [:from] concat (collify tables)))
(update-in m [:from] concat (collify tables)))
(defmethod build-clause :where [_ m pred]
(if (nil? pred)
@ -73,22 +73,22 @@
pred)))))
(defhelper join [m clauses]
(assoc m :join clauses))
(assoc m :join clauses))
(defhelper merge-join [m clauses]
(update-in m [:join] concat clauses))
(update-in m [:join] concat clauses))
(defhelper left-join [m clauses]
(assoc m :left-join clauses))
(assoc m :left-join clauses))
(defhelper merge-left-join [m clauses]
(update-in m [:left-join] concat clauses))
(update-in m [:left-join] concat clauses))
(defhelper right-join [m clauses]
(assoc m :right-join clauses))
(assoc m :right-join clauses))
(defhelper merge-right-join [m clauses]
(update-in m [:right-join] concat clauses))
(update-in m [:right-join] concat clauses))
(defmethod build-clause :group-by [_ m fields]
(assoc m :group-by (collify fields)))
@ -100,7 +100,7 @@
(build-clause :group-by m fields)))
(defhelper merge-group-by [m fields]
(update-in m [:group-by] concat (collify fields)))
(update-in m [:group-by] concat (collify fields)))
(defmethod build-clause :having [_ m pred]
(if (nil? pred)
@ -129,30 +129,30 @@
pred)))))
(defhelper order-by [m fields]
(assoc m :order-by (collify fields)))
(assoc m :order-by (collify fields)))
(defhelper merge-order-by [m fields]
(update-in m [:order-by] concat (collify fields)))
(update-in m [:order-by] concat (collify fields)))
(defhelper limit [m l]
(if (nil? l)
m
(assoc m :limit (if (coll? l) (first l) l))))
(if (nil? l)
m
(assoc m :limit (if (coll? l) (first l) l))))
(defhelper offset [m o]
(if (nil? o)
m
(assoc m :offset (if (coll? o) (first o) o))))
(if (nil? o)
m
(assoc m :offset (if (coll? o) (first o) o))))
(defhelper modifiers [m ms]
(if (nil? ms)
m
(assoc m :modifiers (collify ms))))
(if (nil? ms)
m
(assoc m :modifiers (collify ms))))
(defhelper merge-modifiers [m ms]
(if (nil? ms)
m
(update-in m [:modifiers] concat (collify ms))))
(if (nil? ms)
m
(update-in m [:modifiers] concat (collify ms))))
(defmethod build-clause :insert-into [_ m table]
(assoc m :insert-into table))
@ -162,10 +162,10 @@
([m table] (build-clause :insert-into m table)))
(defhelper columns [m fields]
(assoc m :columns (collify fields)))
(assoc m :columns (collify fields)))
(defhelper merge-columns [m fields]
(update-in m [:columns] concat (collify fields)))
(update-in m [:columns] concat (collify fields)))
(defmethod build-clause :values [_ m vs]
(assoc m :values vs))
@ -209,3 +209,33 @@
(defn delete-from
([table] (delete-from nil table))
([m table] (build-clause :delete-from m table)))
(defmethod build-clause :delete [_ m table]
(assoc m :delete table))
(defn delete
([table] (delete nil table))
([m table] (build-clause :delete m table)))
(defmethod build-clause :over [_ m table]
(assoc m :over table))
(defn over
([part-clause] (over nil part-clause))
([m part-clause] (build-clause :over m part-clause)))
(defhelper merge-over [m fields]
(update-in m [:over] (partial apply merge) (collify fields)))
(defhelper aggregate [m aggregate-fn]
(assoc m :aggregate (first aggregate-fn)))
(defn aggregate
([table] (aggregate nil table))
([m table] (build-clause :aggregate m table)))
(defhelper spartition-by [m fields]
(assoc m :partition-by (collify fields)))
(defhelper merge-partition-by [m fields]
(update-in m [:partition-by] concat (collify fields)))