diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-11 11:29:52 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-11 11:29:52 -0700 |
| commit | 32fcdb3b9e95669ca024285364f96b083135ee82 (patch) | |
| tree | 81b6ac50840aa32b7507c957ee65c918cde44da2 /activerecord/lib | |
| parent | 085bb239f8476003fa06f81e06a7b4a0402401fc (diff) | |
| download | rails-32fcdb3b9e95669ca024285364f96b083135ee82.tar.gz rails-32fcdb3b9e95669ca024285364f96b083135ee82.tar.bz2 rails-32fcdb3b9e95669ca024285364f96b083135ee82.zip | |
remove dead code / make duplicate code more obvious
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index e4fc013e1c..48d8144017 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -53,7 +53,6 @@ module ActiveRecord # def initialize(base, associations, joins) @base_klass = base - @table_joins = joins @join_root = JoinBase.new(base) @alias_tracker = AliasTracker.new(base.connection, joins) @alias_tracker.aliased_name_for(base.table_name) # Updates the count for base.table_name to 1 @@ -215,10 +214,11 @@ module ActiveRecord end def construct_association(record, parent, join_part, row, rs) - caster = rs.column_type(parent.aliased_primary_key) - row_id = caster.type_cast row[parent.aliased_primary_key] + primary_key = parent.aliased_primary_key + type_caster = rs.column_type primary_key + primary_id = type_caster.type_cast row[parent.aliased_primary_key] - return if record.id != row_id + return if record.id != primary_id macro = join_part.reflection.macro if macro == :has_one |