fix values clause to take multiple sets of values
This commit is contained in:
parent
6f2ef8f6c3
commit
806b9bafd6
3 changed files with 14 additions and 5 deletions
|
|
@ -44,7 +44,7 @@
|
|||
:offset
|
||||
:modifiers, :merge-modifiers
|
||||
:insert-into
|
||||
:values
|
||||
:values, :merge-values
|
||||
:update
|
||||
:set
|
||||
:delete-from"
|
||||
|
|
|
|||
|
|
@ -334,11 +334,13 @@
|
|||
(str "INSERT INTO " (to-sql table)))
|
||||
|
||||
(defmethod format-clause :values [[_ values] _]
|
||||
(if (sequential? values)
|
||||
(str "VALUES (" (comma-join (map to-sql values)) ")")
|
||||
(if (sequential? (first values))
|
||||
(str "VALUES " (comma-join (for [x values]
|
||||
(str "(" (comma-join (map to-sql x)) ")"))))
|
||||
(str
|
||||
"(" (comma-join (map to-sql (keys values))) ") VALUES ("
|
||||
(comma-join (map to-sql (vals values))) ")")))
|
||||
"(" (comma-join (map to-sql (keys (first values)))) ") VALUES "
|
||||
(comma-join (for [x values]
|
||||
(str "(" (comma-join (map to-sql (vals x))) ")"))))))
|
||||
|
||||
(defmethod format-clause :update [[_ table] _]
|
||||
(str "UPDATE " (to-sql table)))
|
||||
|
|
|
|||
|
|
@ -168,6 +168,13 @@
|
|||
([vs] (values nil vs))
|
||||
([m vs] (build-clause :values m vs)))
|
||||
|
||||
(defmethod build-clause :merge-values [_ m values]
|
||||
(update-in m [:values] concat values))
|
||||
|
||||
(defn merge-values
|
||||
([vs] (merge-values nil vs))
|
||||
([m vs] (build-clause :merge-values m vs)))
|
||||
|
||||
(defmethod build-clause :update [_ m table]
|
||||
(assoc m :update table))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue