database: Change users.gh_encrypted_token column to non-nullable

Author: Turbo87

crates/crates_io_database/src/models/user.rs

@@ -24,7 +24,7 @@ pub struct User {
     #[serde(skip)]
     pub gh_access_token: SecretString,
     #[serde(skip)]
-    pub gh_encrypted_token: Option<Vec<u8>>,
+    pub gh_encrypted_token: Vec<u8>,
     pub account_lock_reason: Option<String>,
     pub account_lock_until: Option<DateTime<Utc>>,
     pub is_admin: bool,
@@ -96,7 +96,7 @@ pub struct NewUser<'a> {
     pub name: Option<&'a str>,
     pub gh_avatar: Option<&'a str>,
     pub gh_access_token: &'a str,
-    pub gh_encrypted_token: Option<&'a [u8]>,
+    pub gh_encrypted_token: &'a [u8],
 }
 
 impl NewUser<'_> {

crates/crates_io_database/src/schema.rs

@@ -881,7 +881,7 @@ diesel::table! {
         /// Whether or not the user wants to receive notifications when a package they own is published
         publish_notifications -> Bool,
         /// Encrypted GitHub access token
-        gh_encrypted_token -> Nullable<Bytea>,
+        gh_encrypted_token -> Bytea,
     }
 }
 

crates/crates_io_database_dump/src/dump-db.toml

@@ -235,6 +235,7 @@ publish_notifications = "private"
 gh_encrypted_token = "private"
 [users.column_defaults]
 gh_access_token = "''"
+gh_encrypted_token = "''"
 
 [version_downloads]
 dependencies = ["versions"]

crates/crates_io_database_dump/src/snapshots/[email protected]

@@ -24,6 +24,7 @@ BEGIN;
     -- Set defaults for non-nullable columns not included in the dump.
 
     ALTER TABLE "users" ALTER COLUMN "gh_access_token" SET DEFAULT '';
+    ALTER TABLE "users" ALTER COLUMN "gh_encrypted_token" SET DEFAULT '';
 
     -- Truncate all tables.
 
@@ -67,6 +68,7 @@ BEGIN;
     -- Drop the defaults again.
 
     ALTER TABLE "users" ALTER COLUMN "gh_access_token" DROP DEFAULT;
+    ALTER TABLE "users" ALTER COLUMN "gh_encrypted_token" DROP DEFAULT;
 
     -- Reenable triggers on each table.
 

migrations/2025-07-16-163013_make_gh_encrypted_token_not_null/down.sql

@@ -0,0 +1 @@
+ALTER TABLE users ALTER COLUMN gh_encrypted_token DROP NOT NULL;

migrations/2025-07-16-163013_make_gh_encrypted_token_not_null/up.sql

@@ -0,0 +1 @@
+ALTER TABLE users ALTER COLUMN gh_encrypted_token SET NOT NULL;

src/controllers/version/docs.rs

@@ -107,6 +107,7 @@ mod tests {
             .gh_id(111)
             .gh_login("other_user")
             .gh_access_token("token")
+            .gh_encrypted_token(&[])
             .build()
             .insert(&mut conn)
             .await?;

src/index.rs

@@ -157,6 +157,7 @@ mod tests {
                 users::gh_login.eq("user1"),
                 users::gh_id.eq(42),
                 users::gh_access_token.eq("some random token"),
+                users::gh_encrypted_token.eq(&[]),
             ))
             .returning(users::id)
             .get_result::<i32>(&mut conn)

src/rate_limiter.rs

@@ -707,6 +707,7 @@ mod tests {
             .gh_id(0)
             .gh_login(gh_login)
             .gh_access_token("some random token")
+            .gh_encrypted_token(&[])
             .build()
             .insert(conn)
             .await

src/tests/mod.rs

@@ -96,6 +96,7 @@ fn new_user(login: &str) -> NewUser<'_> {
         .gh_id(next_gh_id())
         .gh_login(login)
         .gh_access_token("some random token")
+        .gh_encrypted_token(&[])
         .build()
 }