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 [ ds :datasource .close) + (assoc this :ds nil))) (defn new-db [] {:db (map->ClojureGameGeekDb {})}) -(defn ^:private take! - [ch] - (let [v ( (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]