Complete transition to org.clojure/java.jdbc

Author: hlship

project.clj

@@ -4,9 +4,10 @@
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :dependencies [[org.clojure/clojure "1.9.0"]
-                 [org.clojure/core.async "0.4.474"]
                  [com.stuartsierra/component "0.3.2"]
                  [com.walmartlabs/lacinia "0.30.0"]
                  [com.walmartlabs/lacinia-pedestal "0.10.0"]
-                 [alaisi/postgres.async "0.8.0"]
+                 [org.clojure/java.jdbc "0.7.8"]
+                 [org.postgresql/postgresql "42.2.5.jre7"]
+                 [com.mchange/c3p0 "0.9.5.2"]
                  [io.aviso/logging "0.3.1"]])

src/clojure_game_geek/db.clj

@@ -1,108 +1,100 @@
 (ns clojure-game-geek.db
   (:require
     [com.stuartsierra.component :as component]
-    [postgres.async :refer [open-db close-db!] :as pa]
-    [clojure.core.async :refer [<!!]]
     [io.pedestal.log :as log]
-    [clojure.string :as str]))
+    [clojure.java.jdbc :as jdbc]
+    [clojure.string :as str])
+  (:import (com.mchange.v2.c3p0 ComboPooledDataSource)))
 
-(defrecord ClojureGameGeekDb [conn]
+(defn ^:private pooled-data-source
+  [host dbname user password port]
+  {:datasource
+   (doto (ComboPooledDataSource.)
+     (.setDriverClass "org.postgresql.Driver")
+     (.setJdbcUrl (str "jdbc:postgresql://" host ":" port "/" dbname))
+     (.setUser user)
+     (.setPassword password))})
+
+(defrecord ClojureGameGeekDb [ds]
 
   component/Lifecycle
 
   (start [this]
     (assoc this
-           :conn (open-db {:hostname "localhost"
-                         :database "cggdb"
-                         :username "cgg_role"
-                         :password "lacinia"
-                         ;; Host port mapped to 5432 in the container
-                         :port 25432})))
+           :ds (pooled-data-source "localhost" "cggdb" "cgg_role" "lacinia" 25432)))
 
   (stop [this]
-    (close-db! conn)
-    (assoc this :conn nil)))
+    (-> ds :datasource .close)
+    (assoc this :ds nil)))
 
 (defn new-db
   []
   {:db (map->ClojureGameGeekDb {})})
 
-(defn ^:private take!
-  "Takes a value from a channel and rethrows an exception if that is the
-  conveyed value."
-  [ch]
-  (let [v (<!! ch)]
-    (if (instance? Throwable v)
-      (throw v)
-      v)))
 
-(defn ^:private query!
+(defn ^:private query
   [component statement]
   (let [[sql & params] statement]
     (log/debug :sql (str/replace sql #"\s+" " ")
                :params params))
-  (pa/query! (:conn component) statement))
+  (jdbc/query (:ds component) statement))
 
 (defn find-game-by-id
   [component game-id]
-  (-> (query! component
-              ["select game_id, name, summary, min_players, max_players, created_at, updated_at
-               from board_game where game_id = $1" game-id])
-      take!
-      first))
+  (first
+    (query component
+           ["select game_id, name, summary, min_players, max_players, created_at, updated_at
+             from board_game where game_id = ?" game-id])))
 
 (defn find-member-by-id
   [component member-id]
-  (-> (query! component
-              ["select member_id, name, created_at, updated_at
-              from member
-              where member_id = $1" member-id])
-      take!
-      first))
+  (first
+    (query component
+           ["select member_id, name, created_at, updated_at
+             from member
+             where member_id = $1" member-id])))
 
 (defn list-designers-for-game
   [component game-id]
-  (take!
-    (query! component
-            ["select d.designer_id, d.name, d.uri, d.created_at, d.updated_at
-              from designer d
-              inner join designer_to_game j on (d.designer_id = j.designer_id)
-              where j.game_id = $1
-              order by d.name" game-id])))
+  (query component
+         ["select d.designer_id, d.name, d.uri, d.created_at, d.updated_at
+           from designer d
+           inner join designer_to_game j on (d.designer_id = j.designer_id)
+           where j.game_id = $1
+           order by d.name" game-id]))
 
 (defn list-games-for-designer
   [component designer-id]
-  (take!
-    (query! component
-            ["select g.game_id, g.name, g.summary, g.min_players, g.max_players, g.created_at, g.updated_at
-              from board_game g
-              inner join designer_to_game j on (g.game_id = j.game_id)
-              where j.designer_id = $1
-              order by g.name" designer-id])))
+  (query component
+         ["select g.game_id, g.name, g.summary, g.min_players, g.max_players, g.created_at, g.updated_at
+           from board_game g
+           inner join designer_to_game j on (g.game_id = j.game_id)
+           where j.designer_id = $1
+           order by g.name" designer-id]))
 
 (defn list-ratings-for-game
   [component game-id]
-  (take!
-    (query! component
-            ["select game_id, member_id, rating, created_at, updated_at
-              from game_rating
-              where game_id = $1" game-id])))
+  (query component
+         ["select game_id, member_id, rating, created_at, updated_at
+           from game_rating
+           where game_id = $1" game-id]))
 
 (defn list-ratings-for-member
   [component member-id]
-  (take!
-    (query! component
-            ["select game_id, member_id, rating, created_at, updated_at
-              from game_rating
-              where member_id = $1" member-id])))
+  (query component
+         ["select game_id, member_id, rating, created_at, updated_at
+           from game_rating
+           where member_id = $1" member-id]))
 
 (defn upsert-game-rating
-  "Adds a new game rating, or changes the value of an existing game rating."
+  "Adds a new game rating, or changes the value of an existing game rating.
+
+  Returns nil"
   [component game-id member-id rating]
-  (-> (query! component
-              ["insert into game_rating (game_id, member_id, rating)
-              values ($1, $2, $3)
-              on conflict (game_id, member_id) do update set rating = $3"
-               game-id member-id rating])
-      take!
-      first))
+  (query component
+         ["insert into game_rating (game_id, member_id, rating)
+           values ($1, $2, $3)
+           on conflict (game_id, member_id) do update set rating = $3"
+          game-id member-id rating])
+
+  nil)