Permalink
Browse files

Fixed non-standard SQL generated by preloading has_and_belongs_to_man…

…y association
  • Loading branch information...
1 parent e6c1f46 commit e170d34a634c93efef471f9c0c1dac7377f1fc40 @acangiano acangiano committed with jeremy Jun 11, 2008
Showing with 2 additions and 2 deletions.
  1. +2 −2 activerecord/lib/active_record/association_preload.rb
@@ -103,10 +103,10 @@ def preload_has_and_belongs_to_many_association(records, reflection, preload_opt
associated_records = reflection.klass.find(:all, :conditions => [conditions, ids],
:include => options[:include],
:joins => "INNER JOIN #{connection.quote_table_name options[:join_table]} as t0 ON #{reflection.klass.quoted_table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}",
- :select => "#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as _parent_record_id",
+ :select => "#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as the_parent_record_id",
:order => options[:order])
- set_association_collection_records(id_to_record_map, reflection.name, associated_records, '_parent_record_id')
+ set_association_collection_records(id_to_record_map, reflection.name, associated_records, 'the_parent_record_id')
end
def preload_has_one_association(records, reflection, preload_options={})

0 comments on commit e170d34

Please sign in to comment.