Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 17 insertions, 0 deletions

diff --git a/db/post_migrate/20230112051854_add_not_null_constraint_to_o_auth_access_tokens_expires_in.rb b/db/post_migrate/20230112051854_add_not_null_constraint_to_o_auth_access_tokens_expires_in.rb
new file mode 100644
index 00000000000..21028993f5d
--- /dev/null
+++ b/db/post_migrate/20230112051854_add_not_null_constraint_to_o_auth_access_tokens_expires_in.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddNotNullConstraintToOAuthAccessTokensExpiresIn < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  def up
+    # validate: false ensures that existing records are not affected
+    # https://docs.gitlab.com/ee/development/database/not_null_constraints.html#prevent-new-invalid-records-current-release
+    add_not_null_constraint :oauth_access_tokens, :expires_in, validate: false
+    change_column_default :oauth_access_tokens, :expires_in, 7200
+  end
+
+  def down
+    remove_not_null_constraint :oauth_access_tokens, :expires_in
+    change_column_default :oauth_access_tokens, :expires_in, nil
+  end
+end