Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update to java.jdbc 0.6.2-alpha3
  • Loading branch information
Markus Penttila committed Sep 26, 2016
commit e80ab95b7bd30121e7f19c677d40aa4a6857d223
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.8.0"]
[org.clojure/java.jdbc "0.5.0"]
[org.clojure/java.jdbc "0.6.2-alpha3"]
[org.clojure/core.async "0.2.385"]]
;:pedantic? :abort
:scm {:name "git"
Expand Down
18 changes: 9 additions & 9 deletions src/jeesql/generate.clj
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,27 @@
(first (jdbc/execute! db sql-and-params)))

(defn insert-handler
[db [statement & params]]
(jdbc/db-do-prepared-return-keys db statement params))
[db statement-and-params]
(jdbc/db-do-prepared-return-keys db statement-and-params))

(defn insert-handler-return-keys
[return-keys db [statement & params]]
(with-open [ps (jdbc/prepare-statement (jdbc/get-connection db) statement
:return-keys return-keys)]
(jdbc/db-do-prepared-return-keys db ps params)))
{:return-keys return-keys})]
(jdbc/db-do-prepared-return-keys db (cons ps params))))

(defn query-handler
[row-fn db sql-and-params]
(jdbc/query db sql-and-params
:identifiers lower-case
:row-fn row-fn
:result-set-fn doall))
{:identifiers lower-case
:row-fn row-fn
:result-set-fn doall}))

(defn query-handler-single-value
[db sql-and-params]
(jdbc/query db sql-and-params
:row-fn (comp val first seq)
:result-set-fn first))
{:row-fn (comp val first seq)
:result-set-fn first}))

(defn query-handler-stream
[fetch-size row-fn db result-channel sql-and-params]
Expand Down