diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-07-10 11:24:35 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-07-10 11:24:35 +0000 |
| commit | 1f5260719813a5d80a2f0d58430e37e8d3e99587 (patch) | |
| tree | 39e865106e3a17637453d5914d66a696141311e3 | |
| parent | e08d54225bfccf000335fe59b20d6fd94ee5728f (diff) | |
| parent | 7ce51548acc8fe27ec9325a9a9583e22edbc2822 (diff) | |
| download | gitlab-ce-1f5260719813a5d80a2f0d58430e37e8d3e99587.tar.gz | |
Merge branch 'rails5-mysql-rename-column' into 'master'
Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change for timestamps
See merge request gitlab-org/gitlab-ce!20514
| -rw-r--r-- | changelogs/unreleased/rails5-mysql-rename-column.yml | 5 | ||||
| -rw-r--r-- | config/initializers/active_record_table_definition.rb | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/rails5-mysql-rename-column.yml b/changelogs/unreleased/rails5-mysql-rename-column.yml new file mode 100644 index 00000000000..cbae9250744 --- /dev/null +++ b/changelogs/unreleased/rails5-mysql-rename-column.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change +merge_request: 20514 +author: Jasper Maes +type: fixed diff --git a/config/initializers/active_record_table_definition.rb b/config/initializers/active_record_table_definition.rb index 8e3a1c7a62f..a71069f27a3 100644 --- a/config/initializers/active_record_table_definition.rb +++ b/config/initializers/active_record_table_definition.rb @@ -29,6 +29,11 @@ module ActiveRecord def datetime_with_timezone(column_name, **options) column(column_name, :datetime_with_timezone, options) end + + # Disable timestamp alias to datetime + def aliased_types(name, fallback) + fallback + end end end end |