Fix on conflict bugs

987123879113 · Jun 8, 2024 · 08e742d · 08e742d
1 parent 4c5185f
commit 08e742d
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 28 deletions.
diff --git a/services/gf10/db/profile.sql.go b/services/gf10/db/profile.sql.go
diff --git a/services/gf10/db/score.sql.go b/services/gf10/db/score.sql.go
diff --git a/services/gf10/sql/queries/profile.sql b/services/gf10/sql/queries/profile.sql
@@ -34,5 +34,5 @@ AND puzzle_no = ?;
 INSERT INTO gf10dm9_puzzle
 (game_type, cardid, puzzle_no, flags, hidden)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (cardid, puzzle_no) DO
+ON CONFLICT (game_type, cardid, puzzle_no) DO
 UPDATE SET flags=?4, hidden=?5;
diff --git a/services/gf10/sql/queries/score.sql b/services/gf10/sql/queries/score.sql
@@ -139,7 +139,7 @@ WHERE points > (
 INSERT INTO gf10dm9_shops
 (game_type, sid, pref, name, points)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (sid) DO
+ON CONFLICT (game_type, sid) DO
 UPDATE SET points=points + ?5;
 
 -- name: GetCourseTotalPlayCount :one
@@ -177,5 +177,5 @@ WHERE cardid = ?;
 INSERT INTO gf10dm9_shops
 (game_type, sid, pref, name, points)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (sid) DO
+ON CONFLICT (game_type, sid) DO
 UPDATE SET points=points + ?5;
diff --git a/services/gf10/sql/schema.sql b/services/gf10/sql/schema.sql
@@ -22,7 +22,7 @@ CREATE TABLE gf10dm9_puzzle (
     flags INTEGER NOT NULL,
     hidden INTEGER NOT NULL,
 
-    PRIMARY KEY(game_type, cardid)
+    PRIMARY KEY(game_type, cardid, puzzle_no)
 );
 
 CREATE TABLE gf10dm9_scores (

diff --git a/services/gf11/db/profile.sql.go b/services/gf11/db/profile.sql.go
diff --git a/services/gf11/db/score.sql.go b/services/gf11/db/score.sql.go
diff --git a/services/gf11/sql/queries/profile.sql b/services/gf11/sql/queries/profile.sql
@@ -40,5 +40,5 @@ AND puzzle_no = ?;
 INSERT INTO gf11dm10_puzzle
 (game_type, gdid, puzzle_no, flags, hidden)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (gdid, puzzle_no) DO
+ON CONFLICT (game_type, gdid, puzzle_no) DO
 UPDATE SET flags=?4, hidden=?5;
diff --git a/services/gf11/sql/queries/score.sql b/services/gf11/sql/queries/score.sql
@@ -139,7 +139,7 @@ WHERE points > (
 INSERT INTO gf11dm10_shops
 (game_type, sid, pref, name, points)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (sid) DO
+ON CONFLICT (game_type, sid) DO
 UPDATE SET points=points + ?5;
 
 -- name: GetCourseTotalPlayCount :one
@@ -177,5 +177,5 @@ WHERE gdid = ?;
 INSERT INTO gf11dm10_shops
 (game_type, sid, pref, name, points)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (sid) DO
+ON CONFLICT (game_type, sid) DO
 UPDATE SET points=points + ?5;
diff --git a/services/gf11/sql/schema.sql b/services/gf11/sql/schema.sql
@@ -24,7 +24,7 @@ CREATE TABLE gf11dm10_puzzle (
     flags INTEGER NOT NULL,
     hidden INTEGER NOT NULL,
 
-    PRIMARY KEY(game_type, gdid)
+    PRIMARY KEY(game_type, gdid, puzzle_no)
 );
 
 CREATE TABLE gf11dm10_lands (

diff --git a/services/gf8puv/db/profile.sql.go b/services/gf8puv/db/profile.sql.go
diff --git a/services/gf8puv/db/shop.sql.go b/services/gf8puv/db/shop.sql.go
diff --git a/services/gf8puv/sql/queries/profile.sql b/services/gf8puv/sql/queries/profile.sql
@@ -7,11 +7,11 @@ AND game_type = ?;
 -- name: UpdateCardProfile :exec
 INSERT INTO gf8dm7puv_card_profile (game_type, cardid, name, color, recovery, styles, hidden)
 VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
-ON CONFLICT (cardid) DO
+ON CONFLICT (game_type, cardid) DO
 UPDATE SET color=?4, recovery=?5, styles=?6, hidden=?7;
 
 -- name: UpdatePuzzleProgress :exec
 INSERT INTO gf8dm7puv_puzzles (game_type, cardid, number, flags, out)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (cardid) DO
+ON CONFLICT (game_type, cardid, number) DO
 UPDATE SET number=?3, flags=?4, out=?5;
diff --git a/services/gf8puv/sql/queries/shop.sql b/services/gf8puv/sql/queries/shop.sql
@@ -70,5 +70,5 @@ INSERT INTO gf8dm7puv_shop_machines
 (game_type, pcbid, name, pref)
 VALUES
 (?1, ?2, ?3, ?4)
-ON CONFLICT(pcbid) DO
+ON CONFLICT(game_type, pcbid) DO
 UPDATE SET name = ?3, pref = ?4;
diff --git a/services/gf8puv/sql/schema.sql b/services/gf8puv/sql/schema.sql
@@ -20,7 +20,7 @@ CREATE TABLE gf8dm7puv_puzzles (
     flags INTEGER NOT NULL,
     out INTEGER NOT NULL,
 
-    PRIMARY KEY(game_type, cardid)
+    PRIMARY KEY(game_type, cardid, number)
 );
 
 CREATE TABLE gf8dm7puv_favorites (

diff --git a/services/gf9/db/profile.sql.go b/services/gf9/db/profile.sql.go
diff --git a/services/gf9/db/shop.sql.go b/services/gf9/db/shop.sql.go
diff --git a/services/gf9/sql/queries/profile.sql b/services/gf9/sql/queries/profile.sql
@@ -7,11 +7,11 @@ AND game_type = ?;
 -- name: UpdateCardProfile :exec
 INSERT INTO gf9dm8_card_profile (game_type, cardid, name, recovery, styles, hidden)
 VALUES (?1, ?2, ?3, ?4, ?5, ?6)
-ON CONFLICT (cardid) DO
+ON CONFLICT (game_type, cardid) DO
 UPDATE SET recovery=?4, styles=?5, hidden=?6;
 
 -- name: UpdatePuzzleProgress :exec
 INSERT INTO gf9dm8_puzzles (game_type, cardid, number, flags, out)
 VALUES (?1, ?2, ?3, ?4, ?5)
-ON CONFLICT (cardid) DO
+ON CONFLICT (game_type, cardid, number) DO
 UPDATE SET number=?3, flags=?4, out=?5;
diff --git a/services/gf9/sql/queries/shop.sql b/services/gf9/sql/queries/shop.sql
@@ -62,5 +62,5 @@ INSERT INTO gf9dm8_shop_machines
 (game_type, pcbid, name, pref)
 VALUES
 (?1, ?2, ?3, ?4)
-ON CONFLICT(pcbid) DO
+ON CONFLICT(game_type, pcbid) DO
 UPDATE SET name = ?3, pref = ?4;
diff --git a/services/gf9/sql/schema.sql b/services/gf9/sql/schema.sql
@@ -20,7 +20,7 @@ CREATE TABLE gf9dm8_puzzles (
     flags INTEGER NOT NULL,
     out INTEGER NOT NULL,
 
-    PRIMARY KEY(game_type, cardid)
+    PRIMARY KEY(game_type, cardid, number)
 );
 
 CREATE TABLE gf9dm8_favorites (