Fix post-jdbc.core-migration problems (col. names, upsert, pos. params, constraint)

Author: brdloush

bin/setup-db.sh

@@ -62,6 +62,9 @@ create table game_rating (
   created_at timestamp not null default current_timestamp,
   updated_at timestamp not null default current_timestamp);
 
+alter table game_rating add constraint cost_unique__game_rating_game_id_member_id
+unique (game_id, member_id);
+
 create trigger game_rating_updated_at before update
 on game_rating for each row execute procedure 
 mantain_updated_at();

resources/cgg-schema.edn

@@ -32,7 +32,7 @@
   {:description "A member of Clojure Game Geek.  Members can rate games."
    :fields
    {:member_id {:type (non-null Int)}
-    :member_name {:type (non-null String)
+    :name {:type (non-null String)
                   :description "Unique name of member."}
     :ratings {:type (list :GameRating)
               :description "List of games and ratings provided by this member."

src/clojure_game_geek/db.clj

@@ -39,6 +39,13 @@
                :params params))
   (jdbc/query (:ds component) statement))
 
+(defn ^:private execute!
+  [component statement]
+  (let [[sql & params] statement]
+    (log/debug :sql (str/replace sql #"\s+" " ")
+               :params params))
+  (jdbc/execute! (:ds component) statement))
+
 (defn find-game-by-id
   [component game-id]
   (first
@@ -52,15 +59,15 @@
     (query component
            ["select member_id, name, created_at, updated_at
              from member
-             where member_id = $1" member-id])))
+             where member_id = ?" member-id])))
 
 (defn list-designers-for-game
   [component 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
+           where j.game_id = ?
            order by d.name" game-id]))
 
 (defn list-games-for-designer
@@ -69,32 +76,32 @@
          ["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
+           where j.designer_id = ?
            order by g.name" designer-id]))
 
 (defn list-ratings-for-game
   [component game-id]
   (query component
          ["select game_id, member_id, rating, created_at, updated_at
            from game_rating
-           where game_id = $1" game-id]))
+           where game_id = ?" game-id]))
 
 (defn list-ratings-for-member
   [component member-id]
   (query component
          ["select game_id, member_id, rating, created_at, updated_at
            from game_rating
-           where member_id = $1" member-id]))
+           where member_id = ?" member-id]))
 
 (defn upsert-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
+  (execute! 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])
+           values (?, ?, ?)
+           on conflict (game_id, member_id) do update set rating = ?"
+          game-id member-id rating rating])
 
   nil)

src/clojure_game_geek/schema.clj

@@ -48,17 +48,17 @@
 (defn board-game-designers
   [db]
   (fn [_ _ board-game]
-    (db/list-designers-for-game db (:id board-game))))
+    (db/list-designers-for-game db (:game_id board-game))))
 
 (defn designer-games
   [db]
   (fn [_ _ designer]
-    (db/list-games-for-designer db (:id designer))))
+    (db/list-games-for-designer db (:designer_id designer))))
 
 (defn rating-summary
   [db]
   (fn [_ _ board-game]
-    (let [ratings (map :rating (db/list-ratings-for-game db (:id board-game)))
+    (let [ratings (map :rating (db/list-ratings-for-game db (:game_id board-game)))
           n (count ratings)]
       {:count n
        :average (if (zero? n)
@@ -69,7 +69,7 @@
 (defn member-ratings
   [db]
   (fn [_ _ member]
-    (db/list-ratings-for-member db (:id member))))
+    (db/list-ratings-for-member db (:member_id member))))
 
 (defn game-rating->game
   [db]