Skip to content

Commit d221c2e

Browse files
committed
Auto merge of #2190 - JohnTitor:version-authors-user-id, r=jtgeibel
Remove unused `version_authors.user_id` Fixes #2056 r? `@carols10cents`
2 parents 01cdee4 + 1824cd6 commit d221c2e

File tree

5 files changed

+10
-41
lines changed

5 files changed

+10
-41
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE version_authors ADD COLUMN user_id INTEGER;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE version_authors DROP COLUMN user_id;

src/schema.patch

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ diff --git a/src/schema.rs b/src/schema.rs
22
index df884e4..18e08cd 100644
33
--- a/src/schema.rs
44
+++ b/src/schema.rs
5-
@@ -1,5 +1,7 @@
5+
@@ -1,3 +1,5 @@
66
+#![allow(unused_imports)]
77
+
88
table! {
99
use diesel::sql_types::*;
1010
use diesel_full_text_search::{TsVector as Tsvector};
11-
12-
/// Representation of the `api_tokens` table.
13-
@@ -125,14 +125,8 @@ table! {
14-
/// Its SQL type is `Timestamp`.
11+
@@ -171,12 +173,6 @@
1512
///
1613
/// (Automatically generated by Diesel.)
1714
created_at -> Timestamp,
@@ -23,12 +20,8 @@ index df884e4..18e08cd 100644
2320
- path -> Ltree,
2421
}
2522
}
26-
27-
table! {
28-
@@ -608,11 +610,29 @@ table! {
29-
/// (Automatically generated by Diesel.)
30-
rendered_at -> Timestamp,
31-
}
23+
24+
@@ -678,6 +674,24 @@
3225
}
3326

3427
table! {
@@ -53,11 +46,7 @@ index df884e4..18e08cd 100644
5346
use diesel::sql_types::*;
5447
use diesel_full_text_search::{TsVector as Tsvector};
5548

56-
/// Representation of the `reserved_crate_names` table.
57-
///
58-
@@ -881,23 +901,25 @@ table! {
59-
60-
joinable!(api_tokens -> users (user_id));
49+
@@ -1003,7 +1017,8 @@
6150
joinable!(badges -> crates (crate_id));
6251
joinable!(crate_owner_invitations -> crates (crate_id));
6352
joinable!(crate_owners -> crates (crate_id));
@@ -67,33 +56,19 @@ index df884e4..18e08cd 100644
6756
joinable!(crates_categories -> categories (category_id));
6857
joinable!(crates_categories -> crates (crate_id));
6958
joinable!(crates_keywords -> crates (crate_id));
70-
joinable!(crates_keywords -> keywords (keyword_id));
71-
joinable!(dependencies -> crates (crate_id));
72-
joinable!(dependencies -> versions (version_id));
73-
joinable!(emails -> users (user_id));
74-
joinable!(follows -> crates (crate_id));
75-
joinable!(follows -> users (user_id));
59+
@@ -1016,6 +1031,7 @@
7660
joinable!(publish_limit_buckets -> users (user_id));
7761
joinable!(publish_rate_overrides -> users (user_id));
7862
joinable!(readme_renderings -> versions (version_id));
7963
+joinable!(recent_crate_downloads -> crates (crate_id));
80-
joinable!(version_authors -> users (user_id));
8164
joinable!(version_authors -> versions (version_id));
8265
joinable!(version_downloads -> versions (version_id));
83-
joinable!(version_owner_actions -> api_tokens (owner_token_id));
84-
85-
@@ -913,13 +935,14 @@ allow_tables_to_appear_in_same_query!(
86-
emails,
87-
follows,
88-
keywords,
89-
metadata,
66+
joinable!(version_owner_actions -> api_tokens (api_token_id));
67+
@@ -1043,6 +1059,7 @@
9068
publish_limit_buckets,
9169
publish_rate_overrides,
9270
readme_renderings,
9371
+ recent_crate_downloads,
9472
reserved_crate_names,
9573
teams,
9674
users,
97-
version_authors,
98-
version_downloads,
99-
versions,

src/schema.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -834,12 +834,6 @@ table! {
834834
///
835835
/// (Automatically generated by Diesel.)
836836
version_id -> Int4,
837-
/// The `user_id` column of the `version_authors` table.
838-
///
839-
/// Its SQL type is `Nullable<Int4>`.
840-
///
841-
/// (Automatically generated by Diesel.)
842-
user_id -> Nullable<Int4>,
843837
/// The `name` column of the `version_authors` table.
844838
///
845839
/// Its SQL type is `Varchar`.
@@ -1056,7 +1050,6 @@ joinable!(publish_limit_buckets -> users (user_id));
10561050
joinable!(publish_rate_overrides -> users (user_id));
10571051
joinable!(readme_renderings -> versions (version_id));
10581052
joinable!(recent_crate_downloads -> crates (crate_id));
1059-
joinable!(version_authors -> users (user_id));
10601053
joinable!(version_authors -> versions (version_id));
10611054
joinable!(version_downloads -> versions (version_id));
10621055
joinable!(version_owner_actions -> api_tokens (api_token_id));

src/tasks/dump_db/dump-db.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ dependencies = ["versions"]
184184
[version_authors.columns]
185185
id = "public"
186186
version_id = "public"
187-
user_id = "private"
188187
name = "public"
189188

190189
[version_downloads]

0 commit comments

Comments
 (0)