Merge branch 'rename-column-concurrently-defaults' into 'master'

Fix adding defaults for concurrent column renames

See merge request !11335

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 737fac14f92..d6535f97665 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -382,11 +382,13 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
           expect(model).to receive(:add_column).
             with(:users, :new, :integer,
                  limit: old_column.limit,
-                 default: old_column.default,
                  null: old_column.null,
                  precision: old_column.precision,
                  scale: old_column.scale)
 
+          expect(model).to receive(:change_column_default).
+            with(:users, :new, old_column.default)
+
           expect(model).to receive(:update_column_in_batches)
 
           expect(model).to receive(:copy_indexes).with(:users, :old, :new)
@@ -406,11 +408,13 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
           expect(model).to receive(:add_column).
             with(:users, :new, :integer,
                  limit: old_column.limit,
-                 default: old_column.default,
                  null: old_column.null,
                  precision: old_column.precision,
                  scale: old_column.scale)
 
+          expect(model).to receive(:change_column_default).
+            with(:users, :new, old_column.default)
+
           expect(model).to receive(:update_column_in_batches)
 
           expect(model).to receive(:copy_indexes).with(:users, :old, :new)