update schema with new invite table

hack-as-a-service · Aug 29, 2022 · 702411e · 702411e
1 parent 8a58a59
commit 702411e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/crates/db_models/src/schema.rs b/crates/db_models/src/schema.rs
@@ -29,6 +29,13 @@ table! {
 	}
 }
 
+table! {
+	invites (team_id, user_id) {
+		user_id -> Int4,
+		team_id -> Int4,
+	}
+}
+
 table! {
 	oauth_apps (client_id) {
 		client_id -> Text,
@@ -65,7 +72,6 @@ table! {
 		avatar -> Nullable<Text>,
 		personal -> Bool,
 		slug -> Text,
-		invite -> Text,
 	}
 }
 
@@ -97,6 +103,8 @@ table! {
 joinable!(apps -> teams (team_id));
 joinable!(builds -> apps (app_id));
 joinable!(domains -> apps (app_id));
+joinable!(invites -> teams (team_id));
+joinable!(invites -> users (user_id));
 joinable!(oauth_device_requests -> oauth_apps (oauth_app_id));
 joinable!(oauth_device_requests -> tokens (token));
 joinable!(team_users -> teams (team_id));
@@ -107,6 +115,7 @@ allow_tables_to_appear_in_same_query!(
 	apps,
 	builds,
 	domains,
+	invites,
 	oauth_apps,
 	oauth_device_requests,
 	team_users,

diff --git a/crates/db_models/src/team.rs b/crates/db_models/src/team.rs
@@ -22,7 +22,6 @@ pub struct NewTeam {
 	#[serde(skip_deserializing)]
 	pub personal: bool,
 	pub slug: String,
-	pub invite: String,
 }
 
 #[derive(Clone, Debug, AsChangeset, Deserialize)]

diff --git a/migrations/2022-08-25-052916_invite/up.sql b/migrations/2022-08-25-052916_invite/up.sql
diff --git a/migrations/2022-08-25-052916_invite/down.sql → ...ations/2022-08-29-232653_invites/down.sql b/migrations/2022-08-25-052916_invite/down.sql → ...ations/2022-08-29-232653_invites/down.sql
@@ -1,2 +1,2 @@
 -- This file should undo anything in `up.sql`
-ALTER TABLE teams DROP COLUMN invite
+DROP TABLE team_users
diff --git a/migrations/2022-08-29-232653_invites/up.sql b/migrations/2022-08-29-232653_invites/up.sql
@@ -0,0 +1,6 @@
+-- Your SQL goes here
+CREATE TABLE invites (
+    user_id INTEGER NOT NULL REFERENCES users (id),
+    team_id INTEGER NOT NULL REFERENCES teams (id),
+    PRIMARY KEY (team_id, user_id)
+)