kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'rails5-mysql-rename-column' into 'master'

Browse source 
Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change for timestamps

See merge request gitlab-org/gitlab-ce!20514
This commit is contained in:
Yorick Peterse 2018-07-10 11:24:35 +00:00
commit 1f52607198
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/rails5-mysql-rename-column.yml Normal file
View file

@ -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

5
config/initializers/active_record_table_definition.rb
View file

@ -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