Jon Leighton 735844db71 Merge branch 'master' into nested_has_many_through ... Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb		2011-03-04 09:30:27 +00:00
..
mysql2_specific_schema.rb	update tests for mysql2 support	2010-08-02 01:37:57 -07:00
mysql_specific_schema.rb	Bug Fix -- clean up connection after stored procedure [#3151 state:resolved]	2010-08-17 13:15:58 -07:00
oracle_specific_schema.rb	added additional objects necessary for OracleAdapter specific tests	2009-08-06 23:40:59 +03:00
postgresql_specific_schema.rb	Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)	2010-08-14 04:12:33 -03:00
schema.rb	Merge branch 'master' into nested_has_many_through	2011-03-04 09:30:27 +00:00
sqlite_specific_schema.rb	Use schema.rb for all databases	2008-04-22 13:55:13 +12:00