diff --git a/Octokit.GraphQL/Model/AddedToProjectEvent.cs b/Octokit.GraphQL/Model/AddedToProjectEvent.cs
index 9854f00d..c2ab3ed9 100644
--- a/Octokit.GraphQL/Model/AddedToProjectEvent.cs
+++ b/Octokit.GraphQL/Model/AddedToProjectEvent.cs
@@ -28,7 +28,7 @@ internal AddedToProjectEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the AddedToProjectEvent object
diff --git a/Octokit.GraphQL/Model/App.cs b/Octokit.GraphQL/Model/App.cs
index c25624d6..acd37738 100644
--- a/Octokit.GraphQL/Model/App.cs
+++ b/Octokit.GraphQL/Model/App.cs
@@ -23,7 +23,7 @@ internal App(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The description of the app.
diff --git a/Octokit.GraphQL/Model/BaseRefChangedEvent.cs b/Octokit.GraphQL/Model/BaseRefChangedEvent.cs
index 8b119ba1..592e3d5b 100644
--- a/Octokit.GraphQL/Model/BaseRefChangedEvent.cs
+++ b/Octokit.GraphQL/Model/BaseRefChangedEvent.cs
@@ -33,7 +33,7 @@ internal BaseRefChangedEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the BaseRefChangedEvent object
diff --git a/Octokit.GraphQL/Model/Bot.cs b/Octokit.GraphQL/Model/Bot.cs
index 749ee2bf..4565a3f4 100644
--- a/Octokit.GraphQL/Model/Bot.cs
+++ b/Octokit.GraphQL/Model/Bot.cs
@@ -29,7 +29,7 @@ internal Bot(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the Bot object
diff --git a/Octokit.GraphQL/Model/BranchProtectionRule.cs b/Octokit.GraphQL/Model/BranchProtectionRule.cs
index 238290f0..eecd874a 100644
--- a/Octokit.GraphQL/Model/BranchProtectionRule.cs
+++ b/Octokit.GraphQL/Model/BranchProtectionRule.cs
@@ -65,7 +65,7 @@ internal BranchProtectionRule(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// Will new commits pushed to matching branches dismiss pull request review approvals.
diff --git a/Octokit.GraphQL/Model/CheckAnnotation.cs b/Octokit.GraphQL/Model/CheckAnnotation.cs
index cac141b5..4f39e1fc 100644
--- a/Octokit.GraphQL/Model/CheckAnnotation.cs
+++ b/Octokit.GraphQL/Model/CheckAnnotation.cs
@@ -28,7 +28,7 @@ internal CheckAnnotation(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The position of this annotation.
diff --git a/Octokit.GraphQL/Model/CheckRun.cs b/Octokit.GraphQL/Model/CheckRun.cs
index e2bdd584..6081a884 100644
--- a/Octokit.GraphQL/Model/CheckRun.cs
+++ b/Octokit.GraphQL/Model/CheckRun.cs
@@ -42,7 +42,7 @@ internal CheckRun(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The corresponding deployment for this job, if any
diff --git a/Octokit.GraphQL/Model/CheckSuite.cs b/Octokit.GraphQL/Model/CheckSuite.cs
index 6a6c5fe8..68c0e711 100644
--- a/Octokit.GraphQL/Model/CheckSuite.cs
+++ b/Octokit.GraphQL/Model/CheckSuite.cs
@@ -58,7 +58,7 @@ internal CheckSuite(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the CheckSuite object
diff --git a/Octokit.GraphQL/Model/CommentDeletedEvent.cs b/Octokit.GraphQL/Model/CommentDeletedEvent.cs
index 04a84115..66a39b6c 100644
--- a/Octokit.GraphQL/Model/CommentDeletedEvent.cs
+++ b/Octokit.GraphQL/Model/CommentDeletedEvent.cs
@@ -28,7 +28,7 @@ internal CommentDeletedEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The user who authored the deleted comment.
diff --git a/Octokit.GraphQL/Model/CommitComment.cs b/Octokit.GraphQL/Model/CommitComment.cs
index 81fea490..8916a531 100644
--- a/Octokit.GraphQL/Model/CommitComment.cs
+++ b/Octokit.GraphQL/Model/CommitComment.cs
@@ -58,7 +58,7 @@ internal CommitComment(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The actor who edited the comment.
diff --git a/Octokit.GraphQL/Model/ConvertedNoteToIssueEvent.cs b/Octokit.GraphQL/Model/ConvertedNoteToIssueEvent.cs
index d67303db..f4b4b7e1 100644
--- a/Octokit.GraphQL/Model/ConvertedNoteToIssueEvent.cs
+++ b/Octokit.GraphQL/Model/ConvertedNoteToIssueEvent.cs
@@ -28,7 +28,7 @@ internal ConvertedNoteToIssueEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the ConvertedNoteToIssueEvent object
diff --git a/Octokit.GraphQL/Model/DeployedEvent.cs b/Octokit.GraphQL/Model/DeployedEvent.cs
index b0572018..ed3a6d3c 100644
--- a/Octokit.GraphQL/Model/DeployedEvent.cs
+++ b/Octokit.GraphQL/Model/DeployedEvent.cs
@@ -28,7 +28,7 @@ internal DeployedEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The deployment associated with the 'deployed' event.
diff --git a/Octokit.GraphQL/Model/Deployment.cs b/Octokit.GraphQL/Model/Deployment.cs
index 5abb72fd..fc49d450 100644
--- a/Octokit.GraphQL/Model/Deployment.cs
+++ b/Octokit.GraphQL/Model/Deployment.cs
@@ -38,7 +38,7 @@ internal Deployment(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The deployment description.
diff --git a/Octokit.GraphQL/Model/DeploymentProtectionRule.cs b/Octokit.GraphQL/Model/DeploymentProtectionRule.cs
index 6d4f7b36..4036a34d 100644
--- a/Octokit.GraphQL/Model/DeploymentProtectionRule.cs
+++ b/Octokit.GraphQL/Model/DeploymentProtectionRule.cs
@@ -18,7 +18,7 @@ internal DeploymentProtectionRule(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// Whether deployments to this environment can be approved by the user who created the deployment.
diff --git a/Octokit.GraphQL/Model/DeploymentReview.cs b/Octokit.GraphQL/Model/DeploymentReview.cs
index 3a5a5625..171390bd 100644
--- a/Octokit.GraphQL/Model/DeploymentReview.cs
+++ b/Octokit.GraphQL/Model/DeploymentReview.cs
@@ -23,7 +23,7 @@ internal DeploymentReview(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The environments approved or rejected
diff --git a/Octokit.GraphQL/Model/Discussion.cs b/Octokit.GraphQL/Model/Discussion.cs
index eb4d6a2f..a5ffbd84 100644
--- a/Octokit.GraphQL/Model/Discussion.cs
+++ b/Octokit.GraphQL/Model/Discussion.cs
@@ -97,7 +97,7 @@ internal Discussion(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The actor who edited the comment.
diff --git a/Octokit.GraphQL/Model/DiscussionComment.cs b/Octokit.GraphQL/Model/DiscussionComment.cs
index 3138907f..0fc3fba7 100644
--- a/Octokit.GraphQL/Model/DiscussionComment.cs
+++ b/Octokit.GraphQL/Model/DiscussionComment.cs
@@ -53,7 +53,7 @@ internal DiscussionComment(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The time when this replied-to comment was deleted
diff --git a/Octokit.GraphQL/Model/Enterprise.cs b/Octokit.GraphQL/Model/Enterprise.cs
index 094a1c8b..9fb46ba2 100644
--- a/Octokit.GraphQL/Model/Enterprise.cs
+++ b/Octokit.GraphQL/Model/Enterprise.cs
@@ -54,7 +54,7 @@ internal Enterprise(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The description of the enterprise.
diff --git a/Octokit.GraphQL/Model/Environment.cs b/Octokit.GraphQL/Model/Environment.cs
index 5f828329..d11ebecc 100644
--- a/Octokit.GraphQL/Model/Environment.cs
+++ b/Octokit.GraphQL/Model/Environment.cs
@@ -18,7 +18,7 @@ internal Environment(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the Environment object
diff --git a/Octokit.GraphQL/Model/GistComment.cs b/Octokit.GraphQL/Model/GistComment.cs
index 742b8327..a327950a 100644
--- a/Octokit.GraphQL/Model/GistComment.cs
+++ b/Octokit.GraphQL/Model/GistComment.cs
@@ -53,7 +53,7 @@ internal GistComment(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The actor who edited the comment.
diff --git a/Octokit.GraphQL/Model/IssueComment.cs b/Octokit.GraphQL/Model/IssueComment.cs
index 999b3a11..4db5e2e3 100644
--- a/Octokit.GraphQL/Model/IssueComment.cs
+++ b/Octokit.GraphQL/Model/IssueComment.cs
@@ -53,7 +53,7 @@ internal IssueComment(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The actor who edited the comment.
diff --git a/Octokit.GraphQL/Model/Mannequin.cs b/Octokit.GraphQL/Model/Mannequin.cs
index ca358c76..05856086 100644
--- a/Octokit.GraphQL/Model/Mannequin.cs
+++ b/Octokit.GraphQL/Model/Mannequin.cs
@@ -34,7 +34,7 @@ internal Mannequin(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The mannequin's email on the source instance.
diff --git a/Octokit.GraphQL/Model/MentionedEvent.cs b/Octokit.GraphQL/Model/MentionedEvent.cs
index 1d6c1f97..eba3b566 100644
--- a/Octokit.GraphQL/Model/MentionedEvent.cs
+++ b/Octokit.GraphQL/Model/MentionedEvent.cs
@@ -28,7 +28,7 @@ internal MentionedEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the MentionedEvent object
diff --git a/Octokit.GraphQL/Model/MovedColumnsInProjectEvent.cs b/Octokit.GraphQL/Model/MovedColumnsInProjectEvent.cs
index c8fa4839..88724300 100644
--- a/Octokit.GraphQL/Model/MovedColumnsInProjectEvent.cs
+++ b/Octokit.GraphQL/Model/MovedColumnsInProjectEvent.cs
@@ -28,7 +28,7 @@ internal MovedColumnsInProjectEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the MovedColumnsInProjectEvent object
diff --git a/Octokit.GraphQL/Model/Organization.cs b/Octokit.GraphQL/Model/Organization.cs
index cd45a240..8a2f924b 100644
--- a/Octokit.GraphQL/Model/Organization.cs
+++ b/Octokit.GraphQL/Model/Organization.cs
@@ -66,7 +66,7 @@ internal Organization(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The organization's public profile description.
diff --git a/Octokit.GraphQL/Model/PinnedDiscussion.cs b/Octokit.GraphQL/Model/PinnedDiscussion.cs
index fcd4f5f4..363dbe20 100644
--- a/Octokit.GraphQL/Model/PinnedDiscussion.cs
+++ b/Octokit.GraphQL/Model/PinnedDiscussion.cs
@@ -23,7 +23,7 @@ internal PinnedDiscussion(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The discussion that was pinned.
diff --git a/Octokit.GraphQL/Model/PinnedIssue.cs b/Octokit.GraphQL/Model/PinnedIssue.cs
index 17217a98..3ae86aa5 100644
--- a/Octokit.GraphQL/Model/PinnedIssue.cs
+++ b/Octokit.GraphQL/Model/PinnedIssue.cs
@@ -18,7 +18,7 @@ internal PinnedIssue(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// Identifies the primary key from the database as a BigInt.
diff --git a/Octokit.GraphQL/Model/Project.cs b/Octokit.GraphQL/Model/Project.cs
index 7bb9dcd2..64b8894e 100644
--- a/Octokit.GraphQL/Model/Project.cs
+++ b/Octokit.GraphQL/Model/Project.cs
@@ -57,7 +57,7 @@ internal Project(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the Project object
diff --git a/Octokit.GraphQL/Model/ProjectCard.cs b/Octokit.GraphQL/Model/ProjectCard.cs
index 1803f825..ca0c7a3d 100644
--- a/Octokit.GraphQL/Model/ProjectCard.cs
+++ b/Octokit.GraphQL/Model/ProjectCard.cs
@@ -41,7 +41,7 @@ internal ProjectCard(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the ProjectCard object
diff --git a/Octokit.GraphQL/Model/ProjectColumn.cs b/Octokit.GraphQL/Model/ProjectColumn.cs
index ba2208be..d9e5f5a1 100644
--- a/Octokit.GraphQL/Model/ProjectColumn.cs
+++ b/Octokit.GraphQL/Model/ProjectColumn.cs
@@ -33,7 +33,7 @@ internal ProjectColumn(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the ProjectColumn object
diff --git a/Octokit.GraphQL/Model/ProjectV2.cs b/Octokit.GraphQL/Model/ProjectV2.cs
index dff902c9..198b494a 100644
--- a/Octokit.GraphQL/Model/ProjectV2.cs
+++ b/Octokit.GraphQL/Model/ProjectV2.cs
@@ -38,7 +38,7 @@ internal ProjectV2(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// A field of the project
diff --git a/Octokit.GraphQL/Model/ProjectV2Field.cs b/Octokit.GraphQL/Model/ProjectV2Field.cs
index a72ae018..f7389905 100644
--- a/Octokit.GraphQL/Model/ProjectV2Field.cs
+++ b/Octokit.GraphQL/Model/ProjectV2Field.cs
@@ -28,7 +28,7 @@ internal ProjectV2Field(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the ProjectV2Field object
diff --git a/Octokit.GraphQL/Model/ProjectV2FieldCommon.cs b/Octokit.GraphQL/Model/ProjectV2FieldCommon.cs
index 1ad328a2..e4d826e1 100644
--- a/Octokit.GraphQL/Model/ProjectV2FieldCommon.cs
+++ b/Octokit.GraphQL/Model/ProjectV2FieldCommon.cs
@@ -70,7 +70,7 @@ internal StubIProjectV2FieldCommon(Expression expression) : base(expression)
 
         public ProjectV2FieldType DataType { get; }
 
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         public ID Id { get; }
 
diff --git a/Octokit.GraphQL/Model/ProjectV2Item.cs b/Octokit.GraphQL/Model/ProjectV2Item.cs
index 2a196aa0..101fc608 100644
--- a/Octokit.GraphQL/Model/ProjectV2Item.cs
+++ b/Octokit.GraphQL/Model/ProjectV2Item.cs
@@ -33,7 +33,7 @@ internal ProjectV2Item(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The field value of the first project field which matches the 'name' argument that is set on the item.
@@ -51,6 +51,11 @@ internal ProjectV2Item(Expression expression) : base(expression)
         /// <param name="orderBy">Ordering options for project v2 item field values returned from the connection</param>
         public ProjectV2ItemFieldValueConnection FieldValues(Arg<int>? first = null, Arg<string>? after = null, Arg<int>? last = null, Arg<string>? before = null, Arg<ProjectV2ItemFieldValueOrder>? orderBy = null) => this.CreateMethodCall(x => x.FieldValues(first, after, last, before, orderBy), Octokit.GraphQL.Model.ProjectV2ItemFieldValueConnection.Create);
 
+        /// <summary>
+        /// Identifies the primary key from the database as a BigInt.
+        /// </summary>
+        public string FullDatabaseId { get; }
+
         /// <summary>
         /// The Node ID of the ProjectV2Item object
         /// </summary>
diff --git a/Octokit.GraphQL/Model/ProjectV2ItemFieldDateValue.cs b/Octokit.GraphQL/Model/ProjectV2ItemFieldDateValue.cs
index 5ef596f4..6129ad77 100644
--- a/Octokit.GraphQL/Model/ProjectV2ItemFieldDateValue.cs
+++ b/Octokit.GraphQL/Model/ProjectV2ItemFieldDateValue.cs
@@ -28,7 +28,7 @@ internal ProjectV2ItemFieldDateValue(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// Date value for the field
diff --git a/Octokit.GraphQL/Model/ProjectV2ItemFieldIterationValue.cs b/Octokit.GraphQL/Model/ProjectV2ItemFieldIterationValue.cs
index 8c47a079..49b2de11 100644
--- a/Octokit.GraphQL/Model/ProjectV2ItemFieldIterationValue.cs
+++ b/Octokit.GraphQL/Model/ProjectV2ItemFieldIterationValue.cs
@@ -28,7 +28,7 @@ internal ProjectV2ItemFieldIterationValue(Expression expression) : base(expressi
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The duration of the iteration in days.
diff --git a/Octokit.GraphQL/Model/ProjectV2ItemFieldNumberValue.cs b/Octokit.GraphQL/Model/ProjectV2ItemFieldNumberValue.cs
index c689b911..0c7a44aa 100644
--- a/Octokit.GraphQL/Model/ProjectV2ItemFieldNumberValue.cs
+++ b/Octokit.GraphQL/Model/ProjectV2ItemFieldNumberValue.cs
@@ -28,7 +28,7 @@ internal ProjectV2ItemFieldNumberValue(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The project field that contains this value.
diff --git a/Octokit.GraphQL/Model/ProjectV2ItemFieldSingleSelectValue.cs b/Octokit.GraphQL/Model/ProjectV2ItemFieldSingleSelectValue.cs
index 69ae433d..8d5cab95 100644
--- a/Octokit.GraphQL/Model/ProjectV2ItemFieldSingleSelectValue.cs
+++ b/Octokit.GraphQL/Model/ProjectV2ItemFieldSingleSelectValue.cs
@@ -33,7 +33,7 @@ internal ProjectV2ItemFieldSingleSelectValue(Expression expression) : base(expre
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// A plain-text description of the selected single-select option, such as what the option means.
diff --git a/Octokit.GraphQL/Model/ProjectV2ItemFieldTextValue.cs b/Octokit.GraphQL/Model/ProjectV2ItemFieldTextValue.cs
index d9d45ba2..d67f1a6c 100644
--- a/Octokit.GraphQL/Model/ProjectV2ItemFieldTextValue.cs
+++ b/Octokit.GraphQL/Model/ProjectV2ItemFieldTextValue.cs
@@ -28,7 +28,7 @@ internal ProjectV2ItemFieldTextValue(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The project field that contains this value.
diff --git a/Octokit.GraphQL/Model/ProjectV2ItemFieldValueCommon.cs b/Octokit.GraphQL/Model/ProjectV2ItemFieldValueCommon.cs
index c8b39a8e..1920d6c3 100644
--- a/Octokit.GraphQL/Model/ProjectV2ItemFieldValueCommon.cs
+++ b/Octokit.GraphQL/Model/ProjectV2ItemFieldValueCommon.cs
@@ -70,7 +70,7 @@ internal StubIProjectV2ItemFieldValueCommon(Expression expression) : base(expres
 
         public IActor Creator => this.CreateProperty(x => x.Creator, Octokit.GraphQL.Model.Internal.StubIActor.Create);
 
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         public ProjectV2FieldConfiguration Field => this.CreateProperty(x => x.Field, Octokit.GraphQL.Model.ProjectV2FieldConfiguration.Create);
 
diff --git a/Octokit.GraphQL/Model/ProjectV2IterationField.cs b/Octokit.GraphQL/Model/ProjectV2IterationField.cs
index 14113d81..e213a0e7 100644
--- a/Octokit.GraphQL/Model/ProjectV2IterationField.cs
+++ b/Octokit.GraphQL/Model/ProjectV2IterationField.cs
@@ -33,7 +33,7 @@ internal ProjectV2IterationField(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the ProjectV2IterationField object
diff --git a/Octokit.GraphQL/Model/ProjectV2SingleSelectField.cs b/Octokit.GraphQL/Model/ProjectV2SingleSelectField.cs
index 0eced250..8b80c840 100644
--- a/Octokit.GraphQL/Model/ProjectV2SingleSelectField.cs
+++ b/Octokit.GraphQL/Model/ProjectV2SingleSelectField.cs
@@ -28,7 +28,7 @@ internal ProjectV2SingleSelectField(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the ProjectV2SingleSelectField object
diff --git a/Octokit.GraphQL/Model/ProjectV2View.cs b/Octokit.GraphQL/Model/ProjectV2View.cs
index 755e1530..46b9d5e4 100644
--- a/Octokit.GraphQL/Model/ProjectV2View.cs
+++ b/Octokit.GraphQL/Model/ProjectV2View.cs
@@ -23,7 +23,7 @@ internal ProjectV2View(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The view's visible fields.
diff --git a/Octokit.GraphQL/Model/ProjectV2Workflow.cs b/Octokit.GraphQL/Model/ProjectV2Workflow.cs
index 8fc657f2..a1c2653f 100644
--- a/Octokit.GraphQL/Model/ProjectV2Workflow.cs
+++ b/Octokit.GraphQL/Model/ProjectV2Workflow.cs
@@ -23,7 +23,7 @@ internal ProjectV2Workflow(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// Whether the workflow is enabled.
diff --git a/Octokit.GraphQL/Model/PullRequest.cs b/Octokit.GraphQL/Model/PullRequest.cs
index 5f0cc27c..6e0df9e8 100644
--- a/Octokit.GraphQL/Model/PullRequest.cs
+++ b/Octokit.GraphQL/Model/PullRequest.cs
@@ -153,7 +153,7 @@ internal PullRequest(Expression expression) : base(expression)
         /// Identifies the primary key from the database.
         /// </summary>
         [Obsolete(@"`databaseId` will be removed because it does not support 64-bit signed integer identifiers. Use `fullDatabaseId` instead. Removal on 2024-07-01 UTC.")]
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The number of deletions in this pull request.
diff --git a/Octokit.GraphQL/Model/PullRequestReview.cs b/Octokit.GraphQL/Model/PullRequestReview.cs
index 9c578f61..02fca9fd 100644
--- a/Octokit.GraphQL/Model/PullRequestReview.cs
+++ b/Octokit.GraphQL/Model/PullRequestReview.cs
@@ -73,7 +73,7 @@ internal PullRequestReview(Expression expression) : base(expression)
         /// Identifies the primary key from the database.
         /// </summary>
         [Obsolete(@"`databaseId` will be removed because it does not support 64-bit signed integer identifiers. Use `fullDatabaseId` instead. Removal on 2024-07-01 UTC.")]
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The actor who edited the comment.
diff --git a/Octokit.GraphQL/Model/PullRequestReviewComment.cs b/Octokit.GraphQL/Model/PullRequestReviewComment.cs
index 450126df..e33c506f 100644
--- a/Octokit.GraphQL/Model/PullRequestReviewComment.cs
+++ b/Octokit.GraphQL/Model/PullRequestReviewComment.cs
@@ -59,7 +59,7 @@ internal PullRequestReviewComment(Expression expression) : base(expression)
         /// Identifies the primary key from the database.
         /// </summary>
         [Obsolete(@"`databaseId` will be removed because it does not support 64-bit signed integer identifiers. Use `fullDatabaseId` instead. Removal on 2024-07-01 UTC.")]
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The diff hunk to which the comment applies.
diff --git a/Octokit.GraphQL/Model/Reactable.cs b/Octokit.GraphQL/Model/Reactable.cs
index c0849e16..6b726ff5 100644
--- a/Octokit.GraphQL/Model/Reactable.cs
+++ b/Octokit.GraphQL/Model/Reactable.cs
@@ -62,7 +62,7 @@ internal StubIReactable(Expression expression) : base(expression)
         {
         }
 
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         public ID Id { get; }
 
diff --git a/Octokit.GraphQL/Model/Reaction.cs b/Octokit.GraphQL/Model/Reaction.cs
index 04dc692f..67d9cd5c 100644
--- a/Octokit.GraphQL/Model/Reaction.cs
+++ b/Octokit.GraphQL/Model/Reaction.cs
@@ -28,7 +28,7 @@ internal Reaction(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the Reaction object
diff --git a/Octokit.GraphQL/Model/Release.cs b/Octokit.GraphQL/Model/Release.cs
index fd01567c..fc38c538 100644
--- a/Octokit.GraphQL/Model/Release.cs
+++ b/Octokit.GraphQL/Model/Release.cs
@@ -28,7 +28,7 @@ internal Release(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The description of the release.
diff --git a/Octokit.GraphQL/Model/RemovedFromProjectEvent.cs b/Octokit.GraphQL/Model/RemovedFromProjectEvent.cs
index 1e30b9e5..07426d57 100644
--- a/Octokit.GraphQL/Model/RemovedFromProjectEvent.cs
+++ b/Octokit.GraphQL/Model/RemovedFromProjectEvent.cs
@@ -28,7 +28,7 @@ internal RemovedFromProjectEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the RemovedFromProjectEvent object
diff --git a/Octokit.GraphQL/Model/Repository.cs b/Octokit.GraphQL/Model/Repository.cs
index 098b4c3d..4cd7cccd 100644
--- a/Octokit.GraphQL/Model/Repository.cs
+++ b/Octokit.GraphQL/Model/Repository.cs
@@ -99,7 +99,7 @@ internal Repository(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Ref associated with the repository's default branch.
diff --git a/Octokit.GraphQL/Model/RepositoryRuleset.cs b/Octokit.GraphQL/Model/RepositoryRuleset.cs
index 8c6d6a97..94e98f05 100644
--- a/Octokit.GraphQL/Model/RepositoryRuleset.cs
+++ b/Octokit.GraphQL/Model/RepositoryRuleset.cs
@@ -37,7 +37,7 @@ internal RepositoryRuleset(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The enforcement level of this ruleset
diff --git a/Octokit.GraphQL/Model/ReviewDismissedEvent.cs b/Octokit.GraphQL/Model/ReviewDismissedEvent.cs
index 39fe2881..0b8d4d45 100644
--- a/Octokit.GraphQL/Model/ReviewDismissedEvent.cs
+++ b/Octokit.GraphQL/Model/ReviewDismissedEvent.cs
@@ -28,7 +28,7 @@ internal ReviewDismissedEvent(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// Identifies the optional message associated with the 'review_dismissed' event.
diff --git a/Octokit.GraphQL/Model/ReviewRequest.cs b/Octokit.GraphQL/Model/ReviewRequest.cs
index 01136bae..79c91c3a 100644
--- a/Octokit.GraphQL/Model/ReviewRequest.cs
+++ b/Octokit.GraphQL/Model/ReviewRequest.cs
@@ -23,7 +23,7 @@ internal ReviewRequest(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the ReviewRequest object
diff --git a/Octokit.GraphQL/Model/SavedReply.cs b/Octokit.GraphQL/Model/SavedReply.cs
index 3fdafc54..5ff79964 100644
--- a/Octokit.GraphQL/Model/SavedReply.cs
+++ b/Octokit.GraphQL/Model/SavedReply.cs
@@ -28,7 +28,7 @@ internal SavedReply(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the SavedReply object
diff --git a/Octokit.GraphQL/Model/SecurityAdvisory.cs b/Octokit.GraphQL/Model/SecurityAdvisory.cs
index 8806f4ce..9acbfc50 100644
--- a/Octokit.GraphQL/Model/SecurityAdvisory.cs
+++ b/Octokit.GraphQL/Model/SecurityAdvisory.cs
@@ -37,7 +37,7 @@ internal SecurityAdvisory(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// This is a long plaintext description of the advisory
diff --git a/Octokit.GraphQL/Model/Team.cs b/Octokit.GraphQL/Model/Team.cs
index f308a1dc..5d7944b9 100644
--- a/Octokit.GraphQL/Model/Team.cs
+++ b/Octokit.GraphQL/Model/Team.cs
@@ -55,7 +55,7 @@ internal Team(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The description of the team.
diff --git a/Octokit.GraphQL/Model/TeamDiscussion.cs b/Octokit.GraphQL/Model/TeamDiscussion.cs
index 24fa2041..ca32e0ea 100644
--- a/Octokit.GraphQL/Model/TeamDiscussion.cs
+++ b/Octokit.GraphQL/Model/TeamDiscussion.cs
@@ -83,7 +83,7 @@ internal TeamDiscussion(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The actor who edited the comment.
diff --git a/Octokit.GraphQL/Model/TeamDiscussionComment.cs b/Octokit.GraphQL/Model/TeamDiscussionComment.cs
index a1e65709..f08eaaff 100644
--- a/Octokit.GraphQL/Model/TeamDiscussionComment.cs
+++ b/Octokit.GraphQL/Model/TeamDiscussionComment.cs
@@ -60,7 +60,7 @@ internal TeamDiscussionComment(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The discussion this comment is about.
diff --git a/Octokit.GraphQL/Model/User.cs b/Octokit.GraphQL/Model/User.cs
index 3f3fafcd..82b53839 100644
--- a/Octokit.GraphQL/Model/User.cs
+++ b/Octokit.GraphQL/Model/User.cs
@@ -78,7 +78,7 @@ internal User(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The user's publicly visible profile email.
diff --git a/Octokit.GraphQL/Model/VerifiableDomain.cs b/Octokit.GraphQL/Model/VerifiableDomain.cs
index 41b8e9c6..2ab7816a 100644
--- a/Octokit.GraphQL/Model/VerifiableDomain.cs
+++ b/Octokit.GraphQL/Model/VerifiableDomain.cs
@@ -23,7 +23,7 @@ internal VerifiableDomain(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The DNS host name that should be used for verification.
diff --git a/Octokit.GraphQL/Model/Workflow.cs b/Octokit.GraphQL/Model/Workflow.cs
index c1b29b66..15739633 100644
--- a/Octokit.GraphQL/Model/Workflow.cs
+++ b/Octokit.GraphQL/Model/Workflow.cs
@@ -23,7 +23,7 @@ internal Workflow(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The Node ID of the Workflow object
diff --git a/Octokit.GraphQL/Model/WorkflowRun.cs b/Octokit.GraphQL/Model/WorkflowRun.cs
index 905c03d8..96bd1350 100644
--- a/Octokit.GraphQL/Model/WorkflowRun.cs
+++ b/Octokit.GraphQL/Model/WorkflowRun.cs
@@ -28,7 +28,7 @@ internal WorkflowRun(Expression expression) : base(expression)
         /// <summary>
         /// Identifies the primary key from the database.
         /// </summary>
-        public int? DatabaseId { get; }
+        public long? DatabaseId { get; }
 
         /// <summary>
         /// The log of deployment reviews
diff --git a/Tools/Generate/Program.cs b/Tools/Generate/Program.cs
index ed69daaf..223b2c1d 100644
--- a/Tools/Generate/Program.cs
+++ b/Tools/Generate/Program.cs
@@ -50,9 +50,14 @@ private static async Task GenerateEntities(string token, string path)
 
             foreach (var file in CodeGenerator.Generate(schema, "Octokit.GraphQL", "Octokit.GraphQL.Model"))
             {
+                // fix for int32 overflow, see https://github.com/octokit/octokit.graphql.net/issues/311
+                if (file.Content.Contains("public int? DatabaseId { get; }"))
+                {
+                    file.Content = file.Content.Replace("public int? DatabaseId { get; }", "public long? DatabaseId { get; }");
+                }
                 Console.WriteLine("Writing " + file.Path);
                 File.WriteAllText(Path.Combine(path, file.Path), file.Content);
             }
         }
     }
-}
\ No newline at end of file
+}