diff options
author | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
commit | 418cb3714af8337cc7b727098dd5e5d56e387e54 (patch) | |
tree | 93c7184ea4111354c01f1fad513c2e4f41e35a62 /lib/gitlab/database/migration_helpers.rb | |
parent | 797ffb4a784d1183f2c6b9e67cec55fd3424dec8 (diff) | |
parent | 3541a259327061d10c04a5b287aca9349e0c7860 (diff) |
Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'
Prepare 10.4 RC8 release
See merge request gitlab-org/gitlab-ce!16557
Diffstat (limited to 'lib/gitlab/database/migration_helpers.rb')
-rw-r--r-- | lib/gitlab/database/migration_helpers.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index 7b35c24d153..98de29f12a3 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -524,8 +524,9 @@ module Gitlab install_rename_triggers(table, column, temp_column) # Schedule the jobs that will copy the data from the old column to the - # new one. - relation.each_batch(of: batch_size) do |batch, index| + # new one. Rows with NULL values in our source column are skipped since + # the target column is already NULL at this point. + relation.where.not(column => nil).each_batch(of: batch_size) do |batch, index| start_id, end_id = batch.pluck('MIN(id), MAX(id)').first max_index = index |