fix: jeez forgot about conflicts

amiller68 · Jan 25, 2024 · 5bdeeae · 5bdeeae
1 parent 1f649d5
commit 5bdeeae
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 26 deletions.
diff --git a/.sqlx/query-6b7b09da1c25608208fd0cb530b0f82fa6a266b8dbfb5cf0495b0c4f12ad9e50.json b/.sqlx/query-6b7b09da1c25608208fd0cb530b0f82fa6a266b8dbfb5cf0495b0c4f12ad9e50.json
diff --git a/.sqlx/query-d2f10656fa68f33b31b56ffe52c858873151ff7bedfe2bc093dabf2f52987e6d.json b/.sqlx/query-d2f10656fa68f33b31b56ffe52c858873151ff7bedfe2bc093dabf2f52987e6d.json
diff --git a/src/database/models/game.rs b/src/database/models/game.rs
@@ -94,11 +94,20 @@ impl Game {
         // Insert the FEN into the database if it doesn't already exist
         // Return the position ID
         let board_fen = board.fen();
-
+        // TODO: this is super gross, but I can't figure out how to do this in one query
         let position_id = sqlx::query_scalar!(
-            r#"INSERT INTO positions (board)
-            VALUES ($1)
-            RETURNING id as "id: Uuid"
+            r#"
+            WITH attempted_insert AS (
+                INSERT INTO positions (board)
+                VALUES ($1)
+                ON CONFLICT (board)
+                DO NOTHING
+                RETURNING id
+            )
+            SELECT id FROM attempted_insert
+            UNION ALL
+            SELECT id as "id: Uuid" FROM positions WHERE board = $1
+            LIMIT 1;
             "#,
             board_fen,
         )