diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 18:06:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-12 18:06:26 +0300 |
| commit | 69944ffb68788d190e81ff7e33db5dcb6c903184 (patch) | |
| tree | 4112a1285f186c140749e8410a8a2788b6812500 /lib/gitlab/database | |
| parent | 1b7381e998ff4b33ec8f633766030082e95f10c8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database')
| -rw-r--r-- | lib/gitlab/database/migration_helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index 6bada921ad4..7ea7565f758 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -955,7 +955,7 @@ into similar problems in the future (e.g. when new tables are created). table_name = model_class.quoted_table_name model_class.each_batch(of: batch_size) do |relation| - start_id, end_id = relation.pluck("MIN(#{table_name}.id), MAX(#{table_name}.id)").first + start_id, end_id = relation.pluck("MIN(#{table_name}.id)", "MAX(#{table_name}.id)").first if jobs.length >= BACKGROUND_MIGRATION_JOB_BUFFER_SIZE # Note: This code path generally only helps with many millions of rows |