Skip to content

Support unlogged-spec for queries without logging #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support unlogged-spec for queries without logging #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/duct/database/sql/hikaricp.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@

(defmethod ig/init-key :duct.database.sql/hikaricp
[_ {:keys [logger connection-uri jdbc-url] :as options}]
(sql/->Boundary {:datasource
(-> (dissoc options :logger)
(let [datasource (-> (dissoc options :logger)
(assoc :jdbc-url (or jdbc-url connection-uri))
(hikari-cp/make-datasource)
(cond-> logger (wrap-logger logger)))}))
(hikari-cp/make-datasource))]
(if logger
(-> (sql/->Boundary {:datasource (wrap-logger datasource logger)})
(assoc :unlogged-spec {:datasource datasource}))
(sql/->Boundary {:datasource datasource}))))

(defmethod ig/halt-key! :duct.database.sql/hikaricp [_ {:keys [spec]}]
(let [ds (unwrap-logger (:datasource spec))]
Expand Down
16 changes: 16 additions & 0 deletions test/duct/database/sql/hikaricp_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,19 @@
(is (not (.isClosed (unwrap-logger (:datasource spec)))))
(ig/halt-key! ::sql/hikaricp hikaricp)
(is (.isClosed (unwrap-logger (:datasource spec))))))

(deftest unlogged-test
(let [logs (atom [])
logger (->AtomLogger logs)
hikaricp (ig/init-key ::sql/hikaricp {:jdbc-url "jdbc:sqlite:" :logger logger})
spec (:unlogged-spec hikaricp)]
(jdbc/execute! spec ["CREATE TABLE foo (id INT, body TEXT)"])
(jdbc/db-do-commands spec ["INSERT INTO foo VALUES (1, 'a')"
"INSERT INTO foo VALUES (2, 'b')"])
(is (= (jdbc/query spec ["SELECT * FROM foo"])
[{:id 1, :body "a"} {:id 2, :body "b"}]))
(is (= (jdbc/query spec ["SELECT * FROM foo WHERE id = ?" 1])
[{:id 1, :body "a"}]))
(is (= (jdbc/query spec ["SELECT * FROM foo WHERE id = ? AND body = ?" 1 "a"])
[{:id 1, :body "a"}]))
(is (empty? @logs))))