From eebe71c16781d549aa3b1b48b8802282e709b65d 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 1/2] Switch over to org.clojure/java.jdbc

---
 dev-resources/user.clj       |  1 +
 project.clj                  | 13 +++++------
 src/clojure_game_geek/db.clj | 42 ++++++++++++++++--------------------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/dev-resources/user.clj b/dev-resources/user.clj
index f62170f..ba2b118 100644
--- a/dev-resources/user.clj
+++ b/dev-resources/user.clj
@@ -4,6 +4,7 @@
     [clojure.java.browse :refer [browse-url]]
     [clojure-game-geek.system :as system]
     [clojure.walk :as walk]
+    clojure.java.jdbc.spec
     [com.stuartsierra.component :as component])
   (:import (clojure.lang IPersistentMap)))
 
diff --git a/project.clj b/project.clj
index c3f857f..b7d8800 100644
--- a/project.clj
+++ b/project.clj
@@ -3,10 +3,11 @@
   :url "https://github.com/walmartlabs/clojure-game-geek"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/core.async "0.3.443"]
+  :dependencies [[org.clojure/clojure "1.9.0"]
                  [com.stuartsierra/component "0.3.2"]
-                 [com.walmartlabs/lacinia "0.25.0"]
-                 [com.walmartlabs/lacinia-pedestal "0.7.0"]
-                 [alaisi/postgres.async "0.8.0"]
-                 [io.aviso/logging "0.2.0"]])
+                 [com.walmartlabs/lacinia "0.30.0"]
+                 [com.walmartlabs/lacinia-pedestal "0.10.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 66fa888..132cffe 100644
--- a/src/clojure_game_geek/db.clj
+++ b/src/clojure_game_geek/db.clj
@@ -1,45 +1,41 @@
 (ns clojure-game-geek.db
   (:require
-    [clojure.java.io :as io]
     [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!
-  [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]

From 32458b500ca82d6ad78375aea912a89b0a0243ee Mon Sep 17 00:00:00 2001
From: "Howard M. Lewis Ship" <hlship@walmartlabs.com>
Date: Fri, 19 Oct 2018 20:13:07 -0700
Subject: [PATCH 2/2] Don't load the spec stuff

---
 dev-resources/user.clj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-resources/user.clj b/dev-resources/user.clj
index ba2b118..f62170f 100644
--- a/dev-resources/user.clj
+++ b/dev-resources/user.clj
@@ -4,7 +4,6 @@
     [clojure.java.browse :refer [browse-url]]
     [clojure-game-geek.system :as system]
     [clojure.walk :as walk]
-    clojure.java.jdbc.spec
     [com.stuartsierra.component :as component])
   (:import (clojure.lang IPersistentMap)))