summaryrefslogtreecommitdiff
path: root/lib/gitlab/database/migration_helpers.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-07-25 18:10:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-07-25 18:10:00 +0000
commit0599ea8fb389d70cab67a78e80d61eadc6aeaaff (patch)
treeec1a88b84086f74d20b5a7c018ef1c53f11a592d /lib/gitlab/database/migration_helpers.rb
parentd5fa3bac88ff4b8c5870d6d7988fc7e37832c183 (diff)
downloadgitlab-ce-0599ea8fb389d70cab67a78e80d61eadc6aeaaff.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database/migration_helpers.rb')
-rw-r--r--lib/gitlab/database/migration_helpers.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 4bb1d71ce18..ea1beeaf81e 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -1666,7 +1666,9 @@ into similar problems in the future (e.g. when new tables are created).
end
Gitlab::Database::QueryAnalyzers::RestrictAllowedSchemas.with_suppressed do
- update_column_in_batches(table, new, old_value, batch_column_name: batch_column_name)
+ Gitlab::Database::QueryAnalyzers::GitlabSchemasValidateConnection.with_suppressed do
+ update_column_in_batches(table, new, old_value, batch_column_name: batch_column_name)
+ end
end
add_not_null_constraint(table, new) unless old_col.null