kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

make the duplicate code more similar

Browse source
This commit is contained in:
Aaron Patterson 2013-09-06 11:36:02 -07:00
parent 59ba85fa5e
commit cd85615046
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
activerecord/lib/active_record/fixtures.rb
View file

@ -648,9 +648,12 @@ module ActiveRecord
if (targets = row.delete(association.name.to_s))
targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
table_name = association.join_table
lhs_key = association.through_reflection.foreign_key
rhs_key = association.foreign_key
rows[table_name].concat targets.map { |target|
{ association.through_reflection.foreign_key => row[primary_key_name],
association.foreign_key => ActiveRecord::FixtureSet.identify(target) }
{ lhs_key => row[primary_key_name],
rhs_key => ActiveRecord::FixtureSet.identify(target) }
}
end
end
@ -660,9 +663,12 @@ module ActiveRecord
if (targets = row.delete(association.name.to_s))
targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
table_name = association.join_table
lhs_key = association.foreign_key
rhs_key = association.association_foreign_key
rows[table_name].concat targets.map { |target|
{ association.foreign_key => row[primary_key_name],
association.association_foreign_key => ActiveRecord::FixtureSet.identify(target) }
{ lhs_key => row[primary_key_name],
rhs_key => ActiveRecord::FixtureSet.identify(target) }
}
end
end