This project is archived and is in readonly mode.

Changeset [f420c2ece8015c15c75f25d3f37347e8f51747b4] by Aaron Patterson

Revision f420c2ece8015c15c75f25d3f37347e8f51747b4, committed by Aaron Patterson · January 24th, 2011 @ 05:03 PM

Merge remote branch 'jonleighton/deprecate_habtm_attributes-3-0-stable' into 3-0-stable

jonleighton/deprecate_habtm_attributes-3-0-stable: Added deprecation warning for has_and_belongs_to_many associations where the join table has additional attributes other than the keys. Access to these attributes is removed in 3.1. Please use has_many :through instead. https://github.com/rails/rails/commit/f420c2ece8015c15c75f25d3f3734...

M activerecord/CHANGELOG
M activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M activerecord/test/cases/associations/callbacks_test.rb
M activerecord/test/cases/associations/eager_test.rb
M activerecord/test/cases/associations/extension_test.rb
M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M activerecord/test/cases/associations/has_many_associations_test.rb
M activerecord/test/cases/associations_test.rb
M activerecord/test/cases/base_test.rb
M activerecord/test/cases/finder_test.rb
M activerecord/test/cases/method_scoping_test.rb
M activerecord/test/cases/modules_test.rb
M activerecord/test/cases/persistence_test.rb
M activerecord/test/cases/readonly_test.rb
M activerecord/test/cases/relation_scoping_test.rb