Commit 60463f2b authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'sh-fix-bulk-insert-schema-leakage' into 'master'

Fix order-dependent failure in bulk_insert_safe_spec.rb

Closes #221784

See merge request gitlab-org/gitlab!34468
parents e15d4191 c57061c4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'spec_helper' require 'spec_helper'
describe BulkInsertSafe do describe BulkInsertSafe do
class BulkInsertItem < ApplicationRecord class BulkInsertItem < ActiveRecord::Base
include BulkInsertSafe include BulkInsertSafe
include ShaAttribute include ShaAttribute
...@@ -74,6 +74,8 @@ describe BulkInsertSafe do ...@@ -74,6 +74,8 @@ describe BulkInsertSafe do
ActiveRecord::Schema.define do ActiveRecord::Schema.define do
drop_table :bulk_insert_items, force: true drop_table :bulk_insert_items, force: true
end end
BulkInsertItem.reset_column_information
end end
describe BulkInsertItem do describe BulkInsertItem do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment