aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-09-06 11:29:40 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-09-06 11:29:40 -0700
commit59ba85fa5e31965130632d0c90c508693b14b086 (patch)
tree1cd5986da0779b216b11853774a6771f65536529
parent97a19c6b4b71d1e12d62d880ec8c8eed357b3d3c (diff)
downloadrails-59ba85fa5e31965130632d0c90c508693b14b086.tar.gz
rails-59ba85fa5e31965130632d0c90c508693b14b086.tar.bz2
rails-59ba85fa5e31965130632d0c90c508693b14b086.zip
auto link hm:t fixture join tables like habtm
-rw-r--r--activerecord/lib/active_record/fixtures.rb16
-rw-r--r--activerecord/test/cases/fixtures_test.rb35
2 files changed, 51 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index a36dc8cd1b..f185581dda 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -623,6 +623,10 @@ module ActiveRecord
row[fk_name] = ActiveRecord::FixtureSet.identify(value)
end
+ when :has_many
+ if association.options[:through]
+ handle_hmt(rows, row, association)
+ end
when :has_and_belongs_to_many
handle_habtm(rows, row, association)
end
@@ -639,6 +643,18 @@ module ActiveRecord
@primary_key_name ||= model_class && model_class.primary_key
end
+ def handle_hmt(rows, row, association)
+ # This is the case when the join table has no fixtures file
+ if (targets = row.delete(association.name.to_s))
+ targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
+ table_name = association.join_table
+ rows[table_name].concat targets.map { |target|
+ { association.through_reflection.foreign_key => row[primary_key_name],
+ association.foreign_key => ActiveRecord::FixtureSet.identify(target) }
+ }
+ end
+ end
+
def handle_habtm(rows, row, association)
# This is the case when the join table has no fixtures file
if (targets = row.delete(association.name.to_s))
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 4e877aed2e..22eeb5076c 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -263,6 +263,41 @@ class FixturesTest < ActiveRecord::TestCase
end
end
+class HasManyThroughFixture < ActiveSupport::TestCase
+ def make_model(name)
+ Class.new(ActiveRecord::Base) { define_singleton_method(:name) { name } }
+ end
+
+ def test_has_many_through
+ pt = make_model "ParrotTreasure"
+ parrot = make_model "Parrot"
+ treasure = make_model "Treasure"
+
+ pt.table_name = "parrots_treasures"
+ pt.belongs_to :parrot, :class => parrot
+ pt.belongs_to :treasure, :class => treasure
+
+ parrot.has_many :parrot_treasures, :class => pt
+ parrot.has_many :treasures, :through => :parrot_treasures
+
+ parrots = File.join FIXTURES_ROOT, 'parrots'
+
+ fs = ActiveRecord::FixtureSet.new parrot.connection, "parrots", parrot, parrots
+ rows = fs.table_rows
+ assert_equal load_has_and_belongs_to_many['parrots_treasures'], rows['parrots_treasures']
+ end
+
+ def load_has_and_belongs_to_many
+ parrot = make_model "Parrot"
+ parrot.has_and_belongs_to_many :treasures
+
+ parrots = File.join FIXTURES_ROOT, 'parrots'
+
+ fs = ActiveRecord::FixtureSet.new parrot.connection, "parrots", parrot, parrots
+ fs.table_rows
+ end
+end
+
if Account.connection.respond_to?(:reset_pk_sequence!)
class FixturesResetPkSequenceTest < ActiveRecord::TestCase
fixtures :accounts