diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-06-09 20:13:50 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-06-21 22:06:50 +0200 |
| commit | 1ec356a0b5b6594ef0df3fb764cb57c0859ca86f (patch) | |
| tree | b75ffcc6ec975429457a4ac7e0d6c701ee3bfc95 /db | |
| parent | e3a1b825f4c787e2fb29f852c530138347014d31 (diff) | |
| download | gitlab-ce-1ec356a0b5b6594ef0df3fb764cb57c0859ca86f.tar.gz | |
Mysql fixes for Rails 5jprovazn-rails5-mysql-datetime
* `MysqlDateTimeWithTimeZone` inherits from `ActiveRecord::Type::DateTime`
(`MysqlDateTime` is not present in Rails 5)
* explicitly set `NULL` default value for `merge_request_diff_files`'s
`diff` column (otherwise empty string is used in a migration) and
empty string is not allowed for text/blob fields in Mysql
* disable NO_ZERO_DATE mode for all Mysql DB connections, otherwise
SQL queries fail on inserting `0` value for `created_at` column
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/merge_request_diff_file_limits_to_mysql.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/migrate/merge_request_diff_file_limits_to_mysql.rb b/db/migrate/merge_request_diff_file_limits_to_mysql.rb index 3958380e4b9..ca3bc7d6be9 100644 --- a/db/migrate/merge_request_diff_file_limits_to_mysql.rb +++ b/db/migrate/merge_request_diff_file_limits_to_mysql.rb @@ -4,7 +4,7 @@ class MergeRequestDiffFileLimitsToMysql < ActiveRecord::Migration def up return unless Gitlab::Database.mysql? - change_column :merge_request_diff_files, :diff, :text, limit: 2147483647 + change_column :merge_request_diff_files, :diff, :text, limit: 2147483647, default: nil end def down |