Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix fixtures loading for models with same table names in different databases #27355

Merged
merged 1 commit into from
Dec 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions activerecord/lib/active_record/fixtures.rb
Original file line number Diff line number Diff line change
Expand Up @@ -536,16 +536,16 @@ def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}
update_all_loaded_fixtures fixtures_map

connection.transaction(requires_new: true) do
deleted_tables = Set.new
deleted_tables = Hash.new { |h, k| h[k] = Set.new }
fixture_sets.each do |fs|
conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
table_rows = fs.table_rows

table_rows.each_key do |table|
unless deleted_tables.include? table
unless deleted_tables[conn].include? table
conn.delete "DELETE FROM #{conn.quote_table_name(table)}", "Fixture Delete"
end
deleted_tables << table
deleted_tables[conn] << table
end

table_rows.each do |fixture_set_name, rows|
Expand Down
15 changes: 15 additions & 0 deletions activerecord/test/cases/fixtures_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
require "models/computer"
require "models/course"
require "models/developer"
require "models/dog"
require "models/doubloon"
require "models/joke"
require "models/matey"
require "models/other_dog"
require "models/parrot"
require "models/pirate"
require "models/post"
Expand Down Expand Up @@ -1021,3 +1023,16 @@ def teardown
assert_nil fixture_class_names["unregistered_identifier"]
end
end

class SameNameDifferentDatabaseFixturesTest < ActiveRecord::TestCase
fixtures :dogs, :other_dogs

test "fixtures are properly loaded" do
# Force loading the fixtures again to reproduce issue
ActiveRecord::FixtureSet.reset_cache
create_fixtures("dogs", "other_dogs")

assert_kind_of Dog, dogs(:sophie)
assert_kind_of OtherDog, other_dogs(:lassie)
end
end
2 changes: 2 additions & 0 deletions activerecord/test/fixtures/other_dogs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lassie:
id: 1
5 changes: 5 additions & 0 deletions activerecord/test/models/other_dog.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require_dependency "models/arunit2_model"

class OtherDog < ARUnit2Model
self.table_name = "dogs"
end
2 changes: 2 additions & 0 deletions activerecord/test/schema/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1050,3 +1050,5 @@
t.references :course
t.references :professor
end

OtherDog.connection.create_table :dogs, force: true
1 change: 1 addition & 0 deletions activerecord/test/support/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
require "models/college"
require "models/course"
require "models/professor"
require "models/other_dog"

module ARTest
def self.connection_name
Expand Down