Migrate issuecomment table to i64 ids

migrations/2026-04-23-000918_to_bigint/down.sql

@@ -0,0 +1,4 @@
+-- TODO: is there a reasonable rollback procedure? I think we could undo the
+-- data type changes, but it would likely mean deleting some comments from the
+-- database that can no longer be represented. Is that a reasonable tradeoff?
+begin; commit;

migrations/2026-04-23-000918_to_bigint/up.sql

@@ -0,0 +1,56 @@
+begin;
+
+-- Update all issuecomment referencing columns to bigints
+
+alter table issuecomment alter column id set data type bigint;
+
+alter table fcp_concern alter column fk_initiating_comment set data type bigint;
+alter table fcp_concern alter column fk_resolved_comment set data type bigint;
+
+alter table fcp_proposal alter column fk_bot_tracking_comment set data type bigint;
+alter table fcp_proposal alter column fk_initiating_comment set data type bigint;
+
+alter table poll alter column fk_bot_tracking_comment set data type bigint;
+alter table poll alter column fk_initiating_comment set data type bigint;
+
+alter table rfc_feedback_request alter column fk_feedback_comment set data type bigint;
+
+-- Drop all foreign key constraints so that we can update values one by one.
+
+alter table fcp_concern drop constraint fcp_concern_fk_initiating_comment_fkey;
+alter table fcp_concern drop constraint fcp_concern_fk_resolved_comment_fkey;
+
+alter table fcp_proposal drop constraint fcp_proposal_fk_bot_tracking_comment_fkey;
+alter table fcp_proposal drop constraint fcp_proposal_fk_initiating_comment_fkey;
+
+alter table poll drop constraint poll_fk_bot_tracking_comment_fkey;
+alter table poll drop constraint poll_fk_initiating_comment_fkey;
+
+alter table rfc_feedback_request drop constraint rfc_feedback_request_fk_feedback_comment_fkey;
+
+-- Then update all the values to be u64'd, not i32 storing u32 value.
+
+update fcp_concern set fk_initiating_comment = fk_initiating_comment::bigint + 4294967296 where fk_initiating_comment < 0;
+update fcp_concern set fk_resolved_comment = fk_resolved_comment::bigint + 4294967296 where fk_resolved_comment < 0;
+
+update fcp_proposal set fk_bot_tracking_comment = fk_bot_tracking_comment::bigint + 4294967296 where fk_bot_tracking_comment < 0;
+update fcp_proposal set fk_initiating_comment = fk_initiating_comment::bigint + 4294967296 where fk_initiating_comment < 0;
+
+update poll set fk_bot_tracking_comment = fk_bot_tracking_comment::bigint + 4294967296 where fk_bot_tracking_comment < 0;
+update poll set fk_initiating_comment = fk_initiating_comment::bigint + 4294967296 where fk_initiating_comment < 0;
+
+update rfc_feedback_request set fk_feedback_comment = fk_feedback_comment::bigint + 4294967296 where fk_feedback_comment < 0;
+
+update issuecomment set id = id::bigint + 4294967296 where id < 0;
+
+-- Then re-create the foreign key constraints.
+
+alter table fcp_concern add CONSTRAINT fcp_concern_fk_initiating_comment_fkey FOREIGN KEY (fk_initiating_comment) REFERENCES issuecomment(id);
+alter table fcp_concern add CONSTRAINT fcp_concern_fk_resolved_comment_fkey FOREIGN KEY (fk_resolved_comment) REFERENCES issuecomment(id);
+alter table fcp_proposal add CONSTRAINT fcp_proposal_fk_bot_tracking_comment_fkey FOREIGN KEY (fk_bot_tracking_comment) REFERENCES issuecomment(id);
+alter table fcp_proposal add CONSTRAINT fcp_proposal_fk_initiating_comment_fkey FOREIGN KEY (fk_initiating_comment) REFERENCES issuecomment(id);
+alter table poll add CONSTRAINT poll_fk_bot_tracking_comment_fkey FOREIGN KEY (fk_bot_tracking_comment) REFERENCES issuecomment(id);
+alter table poll add CONSTRAINT poll_fk_initiating_comment_fkey FOREIGN KEY (fk_initiating_comment) REFERENCES issuecomment(id);
+alter table rfc_feedback_request add CONSTRAINT rfc_feedback_request_fk_feedback_comment_fkey FOREIGN KEY (fk_feedback_comment) REFERENCES issuecomment(id);
+
+commit;

src/domain/github.rs

@@ -154,8 +154,7 @@ pub struct Issue {
 #[table_name = "issuecomment"]
 #[changeset_options(treat_none_as_null = "true")]
 pub struct IssueComment {
-    #[serde(serialize_with = "super::unsigned")]
-    pub id: i32,
+    pub id: i64,
     pub fk_issue: i32,
     #[serde(serialize_with = "super::unsigned")]
     pub fk_user: i32,

src/domain/rfcbot.rs

@@ -7,10 +7,8 @@ use super::schema::*;
 pub struct NewPoll<'a> {
     pub fk_issue: i32,
     pub fk_initiator: i32,
-    //#[serde(serialize_with = "super::unsigned")]
-    pub fk_initiating_comment: i32,
-    //#[serde(serialize_with = "super::unsigned")]
-    pub fk_bot_tracking_comment: i32,
+    pub fk_initiating_comment: i64,
+    pub fk_bot_tracking_comment: i64,
     pub poll_question: &'a str,
     pub poll_created_at: NaiveDateTime,
     pub poll_closed: bool,
@@ -25,10 +23,8 @@ pub struct Poll {
     pub id: i32,
     pub fk_issue: i32,
     pub fk_initiator: i32,
-    #[serde(serialize_with = "super::unsigned")]
-    pub fk_initiating_comment: i32,
-    #[serde(serialize_with = "super::unsigned")]
-    pub fk_bot_tracking_comment: i32,
+    pub fk_initiating_comment: i64,
+    pub fk_bot_tracking_comment: i64,
     pub poll_question: String,
     pub poll_created_at: NaiveDateTime,
     pub poll_closed: bool,
@@ -40,11 +36,9 @@ pub struct Poll {
 pub struct NewFcpProposal<'a> {
     pub fk_issue: i32,
     pub fk_initiator: i32,
-    //#[serde(serialize_with = "super::unsigned")]
-    pub fk_initiating_comment: i32,
+    pub fk_initiating_comment: i64,
     pub disposition: &'a str,
-    //#[serde(serialize_with = "super::unsigned")]
-    pub fk_bot_tracking_comment: i32,
+    pub fk_bot_tracking_comment: i64,
     pub fcp_start: Option<NaiveDateTime>,
     pub fcp_closed: bool,
 }
@@ -77,11 +71,9 @@ pub struct FcpProposal {
     pub id: i32,
     pub fk_issue: i32,
     pub fk_initiator: i32,
-    #[serde(serialize_with = "super::unsigned")]
-    pub fk_initiating_comment: i32,
+    pub fk_initiating_comment: i64,
     pub disposition: String,
-    #[serde(serialize_with = "super::unsigned")]
-    pub fk_bot_tracking_comment: i32,
+    pub fk_bot_tracking_comment: i64,
     pub fcp_start: Option<NaiveDateTime>,
     pub fcp_closed: bool,
 }
@@ -110,9 +102,9 @@ pub struct FcpReviewRequest {
 pub struct NewFcpConcern<'a> {
     pub fk_proposal: i32,
     pub fk_initiator: i32,
-    pub fk_resolved_comment: Option<i32>,
+    pub fk_resolved_comment: Option<i64>,
     pub name: &'a str,
-    pub fk_initiating_comment: i32,
+    pub fk_initiating_comment: i64,
 }
 
 #[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
@@ -121,9 +113,9 @@ pub struct FcpConcern {
     pub id: i32,
     pub fk_proposal: i32,
     pub fk_initiator: i32,
-    pub fk_resolved_comment: Option<i32>,
+    pub fk_resolved_comment: Option<i64>,
     pub name: String,
-    pub fk_initiating_comment: i32,
+    pub fk_initiating_comment: i64,
 }
 
 #[derive(Clone, Debug, Eq, Insertable, Ord, PartialEq, PartialOrd)]
@@ -132,7 +124,7 @@ pub struct NewFeedbackRequest {
     pub fk_initiator: i32,
     pub fk_requested: i32,
     pub fk_issue: i32,
-    pub fk_feedback_comment: Option<i32>,
+    pub fk_feedback_comment: Option<i64>,
 }
 
 #[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
@@ -142,5 +134,5 @@ pub struct FeedbackRequest {
     pub fk_initiator: i32,
     pub fk_requested: i32,
     pub fk_issue: i32,
-    pub fk_feedback_comment: Option<i32>,
+    pub fk_feedback_comment: Option<i64>,
 }

src/domain/schema.rs

@@ -23,10 +23,10 @@ table! {
         fk_initiator -> Int4,
         /// The `fk_resolved_comment` column of the `fcp_concern` table.
         ///
-        /// Its SQL type is `Nullable<Int4>`.
+        /// Its SQL type is `Nullable<Int8>`.
         ///
         /// (Automatically generated by Diesel.)
-        fk_resolved_comment -> Nullable<Int4>,
+        fk_resolved_comment -> Nullable<Int8>,
         /// The `name` column of the `fcp_concern` table.
         ///
         /// Its SQL type is `Varchar`.
@@ -35,10 +35,10 @@ table! {
         name -> Varchar,
         /// The `fk_initiating_comment` column of the `fcp_concern` table.
         ///
-        /// Its SQL type is `Int4`.
+        /// Its SQL type is `Int8`.
         ///
         /// (Automatically generated by Diesel.)
-        fk_initiating_comment -> Int4,
+        fk_initiating_comment -> Int8,
     }
 }
 
@@ -67,10 +67,10 @@ table! {
         fk_initiator -> Int4,
         /// The `fk_initiating_comment` column of the `fcp_proposal` table.
         ///
-        /// Its SQL type is `Int4`.
+        /// Its SQL type is `Int8`.
         ///
         /// (Automatically generated by Diesel.)
-        fk_initiating_comment -> Int4,
+        fk_initiating_comment -> Int8,
         /// The `disposition` column of the `fcp_proposal` table.
         ///
         /// Its SQL type is `Varchar`.
@@ -79,10 +79,10 @@ table! {
         disposition -> Varchar,
         /// The `fk_bot_tracking_comment` column of the `fcp_proposal` table.
         ///
-        /// Its SQL type is `Int4`.
+        /// Its SQL type is `Int8`.
         ///
         /// (Automatically generated by Diesel.)
-        fk_bot_tracking_comment -> Int4,
+        fk_bot_tracking_comment -> Int8,
         /// The `fcp_start` column of the `fcp_proposal` table.
         ///
         /// Its SQL type is `Nullable<Timestamp>`.
@@ -287,10 +287,10 @@ table! {
     issuecomment (id) {
         /// The `id` column of the `issuecomment` table.
         ///
-        /// Its SQL type is `Int4`.
+        /// Its SQL type is `Int8`.
         ///
         /// (Automatically generated by Diesel.)
-        id -> Int4,
+        id -> Int8,
         /// The `fk_issue` column of the `issuecomment` table.
         ///
         /// Its SQL type is `Int4`.
@@ -467,16 +467,16 @@ table! {
         fk_initiator -> Int4,
         /// The `fk_initiating_comment` column of the `poll` table.
         ///
-        /// Its SQL type is `Int4`.
+        /// Its SQL type is `Int8`.
         ///
         /// (Automatically generated by Diesel.)
-        fk_initiating_comment -> Int4,
+        fk_initiating_comment -> Int8,
         /// The `fk_bot_tracking_comment` column of the `poll` table.
         ///
-        /// Its SQL type is `Int4`.
+        /// Its SQL type is `Int8`.
         ///
         /// (Automatically generated by Diesel.)
-        fk_bot_tracking_comment -> Int4,
+        fk_bot_tracking_comment -> Int8,
         /// The `poll_question` column of the `poll` table.
         ///
         /// Its SQL type is `Varchar`.
@@ -677,10 +677,10 @@ table! {
         fk_issue -> Int4,
         /// The `fk_feedback_comment` column of the `rfc_feedback_request` table.
         ///
-        /// Its SQL type is `Nullable<Int4>`.
+        /// Its SQL type is `Nullable<Int8>`.
         ///
         /// (Automatically generated by Diesel.)
-        fk_feedback_comment -> Nullable<Int4>,
+        fk_feedback_comment -> Nullable<Int8>,
     }
 }
 

src/github/client.rs

@@ -203,12 +203,12 @@ impl Client {
     pub fn edit_comment(
         &self,
         repo: &str,
-        comment_num: i32,
+        comment_num: i64,
         text: &str,
     ) -> DashResult<CommentFromJson> {
         let url = format!(
             "{}/repos/{}/issues/comments/{}",
-            BASE_URL, repo, comment_num as u32
+            BASE_URL, repo, comment_num as u64
         );
         let payload = serde_json::to_string(&btreemap!("body" => text))?;
         Ok(self.patch(&url, &payload)?.error_for_status()?.json()?)

src/github/models.rs

@@ -1,6 +1,7 @@
 // Copyright 2016 Adam Perry. Dual-licensed MIT and Apache 2.0 (see LICENSE files for details).
 
 use std::i32;
+use std::convert::TryInto;
 
 use chrono::{DateTime, Utc};
 
@@ -104,7 +105,7 @@ impl IssueFromJson {
 
 #[derive(Debug, Deserialize)]
 pub struct CommentFromJson {
-    pub id: u32,
+    pub id: u64,
     pub html_url: String,
     pub body: String,
     pub user: GitHubUser,
@@ -141,7 +142,7 @@ impl CommentFromJson {
             .first::<i32>(&*conn)?;
 
         Ok(IssueComment {
-            id: self.id as i32,
+            id: self.id.try_into().expect("id fits into i64"),
             fk_issue: issue_id,
             fk_user: self.user.id,
             body: self.body.replace(0x00 as char, ""),

src/github/nag.rs

@@ -1151,12 +1151,12 @@ enum CommentType<'a> {
     FcpProposalCancelled(&'a GitHubUser),
     FcpAllReviewedNoConcerns {
         author: &'a GitHubUser,
-        status_comment_id: i32,
+        status_comment_id: i64,
         added_label: bool,
     },
     FcpWeekPassed {
         author: &'a GitHubUser,
-        status_comment_id: i32,
+        status_comment_id: i64,
         added_label: bool,
         disposition: FcpDisposition,
     },
@@ -1330,7 +1330,7 @@ impl<'a> RfcBotComment<'a> {
         }
     }
 
-    fn add_comment_url(issue: &Issue, msg: &mut String, comment_id: i32) {
+    fn add_comment_url(issue: &Issue, msg: &mut String, comment_id: i64) {
         let url = format!(
             "https://github.com/{repo}/{typ}/{number}#issuecomment-{id}",
             repo = issue.repository,
@@ -1340,7 +1340,7 @@ impl<'a> RfcBotComment<'a> {
                 "issues"
             },
             number = issue.number,
-            id = comment_id as u32,
+            id = comment_id as u64,
         );
         msg.push_str(&url);
     }
@@ -1352,7 +1352,7 @@ impl<'a> RfcBotComment<'a> {
         }
     }
 
-    fn post(&self, existing_comment: Option<i32>) -> DashResult<CommentFromJson> {
+    fn post(&self, existing_comment: Option<i64>) -> DashResult<CommentFromJson> {
         use crate::config::CONFIG;
 
         if CONFIG.post_comments {