diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-22 17:15:56 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-22 17:15:56 -0700 |
| commit | cdef4450e550954a9f04255cb0b5cf80e52874fe (patch) | |
| tree | 541268d2996d516f761e5ef9a08f7140e0285f4a /activerecord | |
| parent | 8f171b4d6915109068e5e1c1aa37038b8311f15a (diff) | |
| download | rails-cdef4450e550954a9f04255cb0b5cf80e52874fe.tar.gz rails-cdef4450e550954a9f04255cb0b5cf80e52874fe.tar.bz2 rails-cdef4450e550954a9f04255cb0b5cf80e52874fe.zip | |
removing unused code
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 5ac89a93c2..4664f03ff3 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -215,7 +215,7 @@ module ActiveRecord source = reflection.source_reflection.name through_records.first.class.preload_associations(through_records, source) if through_reflection.macro == :belongs_to - rev_id_to_record_map, rev_ids = construct_id_map(records, through_primary_key) + rev_id_to_record_map = construct_id_map(records, through_primary_key).first rev_primary_key = through_reflection.klass.primary_key through_records.each do |through_record| add_preloaded_record_to_collection(rev_id_to_record_map[through_record[rev_primary_key].to_s], @@ -243,7 +243,6 @@ module ActiveRecord if options[:through] through_records = preload_through_records(records, reflection, options[:through]) - through_reflection = reflections[options[:through]] unless through_records.empty? source = reflection.source_reflection.name through_records.first.class.preload_associations(through_records, source, options) @@ -261,7 +260,6 @@ module ActiveRecord def preload_through_records(records, reflection, through_association) through_reflection = reflections[through_association] - through_primary_key = through_reflection.primary_key_name through_records = [] if reflection.options[:source_type] diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 28234ebe49..742513230e 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -75,8 +75,8 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase end def test_eager_loading_with_primary_key - apple = Firm.create("name" => "Apple") - citibank = Client.create("name" => "Citibank", :firm_name => "Apple") + Firm.create("name" => "Apple") + Client.create("name" => "Citibank", :firm_name => "Apple") citibank_result = Client.find(:first, :conditions => {:name => "Citibank"}, :include => :firm_with_primary_key) assert_not_nil citibank_result.instance_variable_get("@firm_with_primary_key") end |