Merge branch 'dm-rename-column-concurrently-with-null' into 'master'

Disallow NULL on renamed column after default has been set

See merge request !11396

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index d6535f97665..dfa3ae9142e 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -382,7 +382,6 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
           expect(model).to receive(:add_column).
             with(:users, :new, :integer,
                  limit: old_column.limit,
-                 null: old_column.null,
                  precision: old_column.precision,
                  scale: old_column.scale)
 
@@ -391,6 +390,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
           expect(model).to receive(:update_column_in_batches)
 
+          expect(model).to receive(:change_column_null).with(:users, :new, false)
+
           expect(model).to receive(:copy_indexes).with(:users, :old, :new)
           expect(model).to receive(:copy_foreign_keys).with(:users, :old, :new)
 
@@ -408,7 +409,6 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
           expect(model).to receive(:add_column).
             with(:users, :new, :integer,
                  limit: old_column.limit,
-                 null: old_column.null,
                  precision: old_column.precision,
                  scale: old_column.scale)
 
@@ -417,6 +417,8 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
 
           expect(model).to receive(:update_column_in_batches)
 
+          expect(model).to receive(:change_column_null).with(:users, :new, false)
+
           expect(model).to receive(:copy_indexes).with(:users, :old, :new)
           expect(model).to receive(:copy_foreign_keys).with(:users, :old, :new)