diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-05-15 22:06:52 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-05-15 22:06:52 +0000 |
commit | c53d06c4d862b2c9744894dce5776c2844fd7949 (patch) | |
tree | a6a452e70b9b12e3f92bdcb04c6937ce943b5516 /lib | |
parent | 45c19a9802e7d960283be22a626dfe128e49e03d (diff) | |
parent | beec97f6cf5f7357238e6f27e48115d6960f3de4 (diff) | |
download | gitlab-ce-c53d06c4d862b2c9744894dce5776c2844fd7949.tar.gz |
Merge branch 'dm-rename-column-concurrently-with-null' into 'master'
Disallow NULL on renamed column after default has been set
See merge request !11396
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/database/migration_helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index f3476dadec8..e76c9abbe04 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -283,7 +283,6 @@ module Gitlab add_column(table, new, new_type, limit: old_col.limit, - null: old_col.null, precision: old_col.precision, scale: old_col.scale) @@ -307,6 +306,8 @@ module Gitlab update_column_in_batches(table, new, Arel::Table.new(table)[old]) + change_column_null(table, new, false) unless old_col.null + copy_indexes(table, old, new) copy_foreign_keys(table, old, new) end |