rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix problem with loading polymorphic associations which have been defined in ↵	Jon Leighton	2011-05-22	1	-3/+7
\| \| \| \|	an abstract superclass. Fixes #552.
*	Add join conditions to JOIN clause, not WHERE	Ernie Miller	2011-05-05	1	-3/+3
\|
*	Extract the constraint-building for joins in JoinAssociation into a separate ↵	Jon Leighton	2011-04-14	1	-8/+14
\| \| \| \|	method to make it easy to change/override (requested by Ernie Miller so that MetaWhere can add to it easily)
*	TableAlias leg ordering has changed, so change accordingly	Aaron Patterson	2011-03-30	1	-1/+1
\|
*	Fix tests under postgres - we should always put conditions in the WHERE part ↵	Jon Leighton	2011-03-12	1	-8/+11
\| \| \| \|	not in ON constraints because postgres requires that the table has been joined before the condition references it.
*	Abstract some common code from AssociationScope and ↵	Jon Leighton	2011-03-11	1	-53/+12
\| \| \| \|	JoinDependency::JoinAssociation into a JoinHelper module
*	Refactor JoinAssociation	Jon Leighton	2011-03-10	1	-100/+54
\|
*	Rename Reflection#through_reflection_chain and #through_options to ↵	Jon Leighton	2011-03-10	1	-9/+7
\| \| \| \|	Reflection#chain and Reflection#options as they now no longer relate solely to through associations.
*	Use Base#type_condition in JoinAssociation	Jon Leighton	2011-03-05	1	-15/+4
\|
*	Push source_type and polymorphic conditions out of ThroughAssociation and ↵	Jon Leighton	2011-03-05	1	-18/+0
\| \| \| \|	JoinDependency::JoinAssociation and into the reflection instead.
*	Merge branch 'master' into nested_has_many_through	Jon Leighton	2011-03-04	1	-177/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Move JoinDependency and friends from ↵	Jon Leighton	2011-02-28	3	-0/+381
	ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations