From 17d36d49c3d2662f12c89bfdf44181c1d82dcf50 Mon Sep 17 00:00:00 2001
From: "Howard M. Lewis Ship" <hlship@walmartlabs.com>
Date: Fri, 19 Oct 2018 19:59:02 -0700
Subject: [PATCH] Merge in changes (use org.clojure/java.jdbc)

---
 project.clj                  |  5 +++--
 src/clojure_game_geek/db.clj | 43 ++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/project.clj b/project.clj
index 210a901..b7d8800 100644
--- a/project.clj
+++ b/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"]])
diff --git a/src/clojure_game_geek/db.clj b/src/clojure_game_geek/db.clj
index fb01ae7..132cffe 100644
--- a/src/clojure_game_geek/db.clj
+++ b/src/clojure_game_geek/db.clj
@@ -1,46 +1,41 @@
 (ns clojure-game-geek.db
   (:require
     [com.stuartsierra.component :as component]
-    [postgres.async :refer [open-db query! close-db!]]
-    [clojure.core.async :refer [<!!]]))
+    [clojure.java.jdbc :as jdbc])
+  (: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 find-game-by-id
   [component game-id]
-  (-> (query! (:conn 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
+    (jdbc/query (:ds 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]