diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-05-22 22:20:27 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-05-22 20:04:13 -0400 |
| commit | 1f9004a8f6b1e4b427621ab4549e1e632e55d537 (patch) | |
| tree | 5190b4536beedc3450fe18e8a0e989feb1ce6562 /lib | |
| parent | 1818e8a1e658565c6f9e64dd6f90ec41094fe77a (diff) | |
| download | gitlab-ce-1f9004a8f6b1e4b427621ab4549e1e632e55d537.tar.gz | |
Merge branch 'fix/migration-helpers-mysql-compatibility' into 'master'
Fix MySQL compatibility in zero downtime migration helpers
## What does this MR do?
This MR fixes MySQL for zero downtime migration helpers introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3860
Closes #17711
See merge request !4239
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/database/migration_helpers.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index 9b662d163f0..fd14234c558 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -39,7 +39,15 @@ module Gitlab def update_column_in_batches(table, column, value) quoted_table = quote_table_name(table) quoted_column = quote_column_name(column) - quoted_value = quote(value) + + ## + # Workaround for #17711 + # + # It looks like for MySQL `ActiveRecord::Base.conntection.quote(true)` + # returns correct value (1), but `ActiveRecord::Migration.new.quote` + # returns incorrect value ('true'), which causes migrations to fail. + # + quoted_value = connection.quote(value) processed = 0 total = exec_query("SELECT COUNT(*) AS count FROM #{quoted_table}"). |