From 0007e5bde3fdb87982f16eaf530ae0ea7d90f512 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Fri, 19 May 2017 07:48:33 +0200 Subject: Resolve migration helper conflicts From `master` --- lib/gitlab/database/migration_helpers.rb | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb index 73d2bc2a66c..e76c9abbe04 100644 --- a/lib/gitlab/database/migration_helpers.rb +++ b/lib/gitlab/database/migration_helpers.rb @@ -278,8 +278,6 @@ module Gitlab raise 'rename_column_concurrently can not be run inside a transaction' end -<<<<<<< HEAD -======= old_col = column_for(table, old) new_type = type || old_col.type @@ -293,7 +291,6 @@ module Gitlab # necessary since we copy over old values further down. change_column_default(table, new, old_col.default) if old_col.default ->>>>>>> c53d06c4d8... Merge branch 'dm-rename-column-concurrently-with-null' into 'master' trigger_name = rename_trigger_name(table, old, new) quoted_table = quote_table_name(table) quoted_old = quote_column_name(old) @@ -307,16 +304,6 @@ module Gitlab quoted_old, quoted_new) end - old_col = column_for(table, old) - new_type = type || old_col.type - - add_column(table, new, new_type, - limit: old_col.limit, - default: old_col.default, - null: old_col.null, - precision: old_col.precision, - scale: old_col.scale) - update_column_in_batches(table, new, Arel::Table.new(table)[old]) change_column_null(table, new, false) unless old_col.null -- cgit v1.2.3