Permalink
Browse files

extract habtm handling to a method

  • Loading branch information...
1 parent 7db9313 commit 5753a8cb2a63284aeb30d5b46e28301478cb779e @tenderlove tenderlove committed Aug 2, 2013
Showing with 12 additions and 8 deletions.
  1. +12 −8 activerecord/lib/active_record/fixtures.rb
@@ -592,14 +592,7 @@ def table_rows
row[fk_name] = ActiveRecord::FixtureSet.identify(value)
end
when :has_and_belongs_to_many
- 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.foreign_key => row[primary_key_name],
- association.association_foreign_key => ActiveRecord::FixtureSet.identify(target) }
- }
- end
+ handle_habtm(rows, row, association)
end
end
end
@@ -614,6 +607,17 @@ def primary_key_name
@primary_key_name ||= model_class && model_class.primary_key
end
+ def handle_habtm(rows, row, association)
+ 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.foreign_key => row[primary_key_name],
+ association.association_foreign_key => ActiveRecord::FixtureSet.identify(target) }
+ }
+ end
+ end
+
def has_primary_key_column?
@has_primary_key_column ||= primary_key_name &&
model_class.columns.any? { |c| c.name == primary_key_name }

0 comments on commit 5753a8c

Please sign in to comment.