luciano/next-jdbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add options back to get-connection

Browse source 
So we can do read-only, non-auto-commit connections
This commit is contained in:
Sean Corfield 2019-01-26 01:59:37 -08:00
parent 8d9289bd14
commit 19ae37b3fe
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/next/jdbc.clj
View file

@ -37,7 +37,7 @@
(defprotocol Sourceable (defprotocol Sourceable
(get-datasource ^DataSource [this])) (get-datasource ^DataSource [this]))
(defprotocol Connectable (defprotocol Connectable
(get-connection ^AutoCloseable [this])) (get-connection ^AutoCloseable [this opts]))
(defprotocol Executable (defprotocol Executable
(-execute ^clojure.lang.IReduceInit [this sql-params opts])) (-execute ^clojure.lang.IReduceInit [this sql-params opts]))
(defprotocol Preparable (defprotocol Preparable
@ -191,7 +191,7 @@
(if transacted (if transacted
;; should check isolation level; maybe implement save points? ;; should check isolation level; maybe implement save points?
(f con) (f con)
(with-open [^AutoCloseable t-con (assoc (get-connection con) (with-open [^AutoCloseable t-con (assoc (get-connection con opts)
;; FIXME: not a record/map! ;; FIXME: not a record/map!
:transacted (atom committable?))] :transacted (atom committable?))]
(let [^Connection jdbc t-con (let [^Connection jdbc t-con
@ -323,8 +323,7 @@
[url etc] [url etc]
;; force DriverManager to be loaded ;; force DriverManager to be loaded
(DriverManager/getLoginTimeout) (DriverManager/getLoginTimeout)
(-> (DriverManager/getConnection url (as-properties etc)) (DriverManager/getConnection url (as-properties etc)))
(modify-connection etc)))
(defn- spec->url+etc (defn- spec->url+etc
"" ""
@ -392,9 +391,10 @@
(extend-protocol Connectable (extend-protocol Connectable
DataSource DataSource
(get-connection [this] (.getConnection this)) (get-connection [this opts] (-> (.getConnection this)
(modify-connection opts)))
Object Object
(get-connection [this] (get-connection (get-datasource this)))) (get-connection [this opts] (get-connection (get-datasource this) opts)))
(extend-protocol Preparable (extend-protocol Preparable
Connection Connection
@ -500,7 +500,7 @@
(let [factory (pre-prepare* opts)] (let [factory (pre-prepare* opts)]
(reify clojure.lang.IReduceInit (reify clojure.lang.IReduceInit
(reduce [_ f init] (reduce [_ f init]
(with-open [con (get-connection this)] (with-open [con (get-connection this opts)]
(with-open [stmt (prepare-fn con sql-params factory)] (with-open [stmt (prepare-fn con sql-params factory)]
(reduce-stmt stmt f init))))))) (reduce-stmt stmt f init)))))))
PreparedStatement PreparedStatement
@ -534,9 +534,9 @@
(def db-spec {:dbtype "h2:mem" :dbname "perf"}) (def db-spec {:dbtype "h2:mem" :dbname "perf"})
(def con db-spec) (def con db-spec)
(def con (get-datasource db-spec)) (def con (get-datasource db-spec))
(get-connection con) (get-connection con {})
(def con (get-connection (get-datasource db-spec))) (def con (get-connection (get-datasource db-spec) {}))
(def con (get-connection db-spec)) (def con (get-connection db-spec {}))
(command! con ["DROP TABLE fruit"]) (command! con ["DROP TABLE fruit"])
(command! con ["CREATE TABLE fruit (id int default 0, name varchar(32) primary key, appearance varchar(32), cost int, grade real)"]) (command! con ["CREATE TABLE fruit (id int default 0, name varchar(32) primary key, appearance varchar(32), cost int, grade real)"])
(command! con ["INSERT INTO fruit (id,name,appearance,cost,grade) VALUES (1,'Apple','red',59,87), (2,'Banana','yellow',29,92.2), (3,'Peach','fuzzy',139,90.0), (4,'Orange','juicy',89,88.6)"]) (command! con ["INSERT INTO fruit (id,name,appearance,cost,grade) VALUES (1,'Apple','red',59,87), (2,'Banana','yellow',29,92.2), (3,'Peach','fuzzy',139,90.0), (4,'Orange','juicy',89,88.6)"])