Permalink
Browse files

reduce duplication somewhat

  • Loading branch information...
1 parent cd85615 commit ea55d86eb110842347351c2b15b4103ed62172fb @tenderlove tenderlove committed Sep 6, 2013
Showing with 14 additions and 14 deletions.
  1. +14 −14 activerecord/lib/active_record/fixtures.rb
@@ -643,33 +643,33 @@ def primary_key_name
@primary_key_name ||= model_class && model_class.primary_key
end
+ def join_rows(targets, row, lhs_key, rhs_key)
+ targets = targets.is_a?(Array) ? targets : targets.split(/\s*,\s*/)
+ targets.map { |target|
+ { lhs_key => row[primary_key_name],
+ rhs_key => ActiveRecord::FixtureSet.identify(target) }
+ }
+ 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
- lhs_key = association.through_reflection.foreign_key
- rhs_key = association.foreign_key
+ lhs_key = association.through_reflection.foreign_key
+ rhs_key = association.foreign_key
- rows[table_name].concat targets.map { |target|
- { lhs_key => row[primary_key_name],
- rhs_key => ActiveRecord::FixtureSet.identify(target) }
- }
+ rows[table_name].concat join_rows(targets, row, lhs_key, rhs_key)
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))
- 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
+ lhs_key = association.foreign_key
+ rhs_key = association.association_foreign_key
- rows[table_name].concat targets.map { |target|
- { lhs_key => row[primary_key_name],
- rhs_key => ActiveRecord::FixtureSet.identify(target) }
- }
+ rows[table_name].concat join_rows(targets, row, lhs_key, rhs_key)
end
end

0 comments on commit ea55d86

Please sign in to comment.