Add database conversion for bridge types

3 files changed, 50 insertions, 4 deletions

diff --git a/server/migrations/20221008120534_init.down.sql b/server/migrations/20221008120534_init.down.sql
index 50ba511..3bff171 100644
--- a/server/migrations/20221008120534_init.down.sql
+++ b/server/migrations/20221008120534_init.down.sql
@@ -6,4 +6,6 @@ drop table if exists object_journal;
 drop table if exists active_tables;
 drop table if exists players;
 drop type if exists player_position;
+drop type if exists suit;
+drop domain if exists rank;
 commit;
diff --git a/server/migrations/20221008120534_init.up.sql b/server/migrations/20221008120534_init.up.sql
index db9fd3c..05b7697 100644
--- a/server/migrations/20221008120534_init.up.sql
+++ b/server/migrations/20221008120534_init.up.sql
@@ -16,6 +16,11 @@ create table active_tables (
   id			     uuid primary key not null
 );
 
+create type player_position as enum ('west', 'north', 'east', 'south');
+create type suit as enum ('club', 'diamond', 'heart', 'spade');
+create domain rank smallint check (value between 2 and 14);
+
+-- TODO: Remove this.
 create table object_journal (
   id   	     			uuid not null,
   seq				bigint not null,
@@ -23,8 +28,6 @@ create table object_journal (
 );
 create unique index journal_entry on object_journal (id, seq);
 
-create type player_position as enum ('west', 'north', 'east', 'south');
-
 create table table_players (
   active_tables_id	     uuid not null references active_tables (id),
   player_id                  varchar(64) not null references players (id),
diff --git a/server/tests/db_test.rs b/server/tests/db_test.rs
index 6acc21e..e495d78 100644
--- a/server/tests/db_test.rs
+++ b/server/tests/db_test.rs
@@ -1,3 +1,4 @@
+use protocol::card::{Rank, Suit};
 use sqlx::Row;
 use tracing::info;
 
@@ -8,7 +9,47 @@ mod common;
 async fn basic_db_query() -> Result<(), anyhow::Error> {
     let db = common::TestDb::new().await;
     let db = db.db();
-    let number = sqlx::query!(r#"select 1 + 1 as number"#).fetch_one(&db).await?;
-    assert_eq!(number.number, Some(2));
+    let row = sqlx::query!(r#"select 1 + 1 as number"#)
+        .fetch_one(&db)
+        .await?;
+    assert_eq!(row.number, Some(2));
+    Ok(())
+}
+
+#[tokio::test]
+#[ignore]
+async fn rank_type_conversion() -> Result<(), anyhow::Error> {
+    let db = common::TestDb::new().await;
+    let db = db.db();
+    let row = sqlx::query!(r#"select cast (2 as rank) as "rank!: Rank""#)
+        .fetch_one(&db)
+        .await?;
+    assert_eq!(Rank::Two, row.rank);
+
+    let rank = Rank::Ace;
+    let (equal,): (bool,) = sqlx::query_as(r#"select ($1 is not distinct from 14)"#)
+        .bind(rank)
+        .fetch_one(&db)
+        .await?;
+    assert!(equal);
+    Ok(())
+}
+
+#[tokio::test]
+#[ignore]
+async fn suit_type_conversion() -> Result<(), anyhow::Error> {
+    let db = common::TestDb::new().await;
+    let db = db.db();
+    let row = sqlx::query!(r#"select cast ('heart' as suit) as "suit!: Suit""#)
+        .fetch_one(&db)
+        .await?;
+    assert_eq!(Suit::Heart, row.suit);
+
+    let suit = Suit::Spade;
+    let (equal,): (bool,) = sqlx::query_as(r#"select ($1 is not distinct from 'spade')"#)
+        .bind(suit)
+        .fetch_one(&db)
+        .await?;
+    assert!(equal);
     Ok(())
 }