@@ -103,10 +103,10 @@ module ActiveRecord 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={}) activerecord/lib/active_record/association_preload.rb e6c1f46eb0fe637195bdf95647dd3aee72467580 Antonio Cangiano acangiano@gmail.com http://github.com/rails/rails/commit/e170d34a634c93efef471f9c0c1dac7377f1fc40 e170d34a634c93efef471f9c0c1dac7377f1fc40 2008-06-11T17:25:39-07:00 2008-06-11T12:25:19-07:00 Fixed non-standard SQL generated by preloading has_and_belongs_to_many association eb5d9566044aa3600c1dbee9c61019a702a3f933 Jeremy Kemper jeremy@bitsweat.net