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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-11-27	171	-1857/+3057
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
\| * \ \ \ \ \	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-11-17	196	-1793/+3968
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb
\| * \ \ \ \ \ \	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-11-08	52	-185/+381
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations.rb
\| * \| \| \| \| \| \| \|	Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵	Jon Leighton	2010-10-31	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixtures in this branch
\| * \| \| \| \| \| \| \|	Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵	Jon Leighton	2010-10-31	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixtures declaration in cascaded_eager_loading_test.rb
\| * \| \| \| \| \| \| \|	Fix naughty trailing whitespace	Jon Leighton	2010-10-31	21	-259/+259
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-10-31	16	-43/+121
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-10-28	116	-632/+6546
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb
\| * \| \| \| \| \| \| \| \| \|	Rename nested_has_many_through_associations_test.rb because it does not only ↵	Jon Leighton	2010-10-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	concern has_many associations
\| * \| \| \| \| \| \| \| \| \|	Add explicit ordering in relations_test.rb, as the lack of this was causing ↵	Jon Leighton	2010-10-19	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	failures against postgres
\| * \| \| \| \| \| \| \| \| \|	Add explicit ordering to nested_has_many_through_associations_test.rb as ↵	Jon Leighton	2010-10-19	1	-32/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this was causing failures under postgres
\| * \| \| \| \| \| \| \| \| \|	Remove obsolete require to active_record/associations/nested_has_many_through	Jon Leighton	2010-10-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix typo	Jon Leighton	2010-10-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove obsolete autoload	Jon Leighton	2010-10-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add a CHANGELOG entry about nested through associations	Jon Leighton	2010-10-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-10-19	67	-1408/+2386
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add some API documentation about nested through associations	Jon Leighton	2010-10-19	1	-8/+52
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add some comments for ThroughReflection#through_reflection_chain	Jon Leighton	2010-10-19	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove various comments and code which were just being used during the ↵	Jon Leighton	2010-10-19	5	-199/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development of nested through association support (OMFGZ, I might just have nearly finished this\!
\| * \| \| \| \| \| \| \| \| \| \|	Add explicit tests for the nested through association changes in reflection.rb	Jon Leighton	2010-10-19	5	-2/+80
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken test	Jon Leighton	2010-10-19	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Small refactoring	Jon Leighton	2010-10-19	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Support the :primary_key option on a through reflection in a nested through ↵	Jon Leighton	2010-10-19	6	-7/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	association
\| * \| \| \| \| \| \| \| \| \| \|	Bugfix/refactoring	Jon Leighton	2010-10-19	3	-11/+20
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused methods	Jon Leighton	2010-10-19	1	-11/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Support for :primary_key option on the source reflection of a through ↵	Jon Leighton	2010-10-19	10	-18/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	association, where the source is a has_one or has_many
\| * \| \| \| \| \| \| \| \| \| \|	Respect the :primary_key option on the through_reflection of (non-nested) ↵	Jon Leighton	2010-10-19	9	-11/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	through associations
\| * \| \| \| \| \| \| \| \| \| \|	Properly support conditions on any of the reflections involved in a nested ↵	Jon Leighton	2010-10-19	16	-98/+235
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	through association
\| * \| \| \| \| \| \| \| \| \| \|	Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵	Jon Leighton	2010-10-17	11	-154/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	etc with just a single scope hash (created on initialization of the proxy). This is now used consistently across all associations. Therefore, all you have to do to ensure finding/counting etc is done correctly is implement the scope correctly.
\| * \| \| \| \| \| \| \| \| \| \|	Make sure nested through associations are read only	Jon Leighton	2010-10-15	6	-9/+82
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix small bug which was shown by the last commit	Jon Leighton	2010-10-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add assertions for nested through associations loaded by includes with ↵	Jon Leighton	2010-10-15	1	-81/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	conditions (uses the single-query strategy). Currently one failure to fix.
\| * \| \| \| \| \| \| \| \| \| \|	Support preloading nested through associations (using the default ↵	Jon Leighton	2010-10-15	2	-122/+216
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	multi-query strategy)
\| * \| \| \| \| \| \| \| \| \| \|	Remove unnecessary requires from nested_has_many_through_associations_test.rb	Jon Leighton	2010-10-14	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add test_has_one_through_has_one_through_with_belongs_to_source_reflection	Jon Leighton	2010-10-14	7	-4/+31
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵	Jon Leighton	2010-10-14	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(which already passes)
\| * \| \| \| \| \| \| \| \| \| \|	Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵	Jon Leighton	2010-10-14	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(which already works)
\| * \| \| \| \| \| \| \| \| \| \|	Added ↵	Jon Leighton	2010-10-14	5	-4/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass
\| * \| \| \| \| \| \| \| \| \| \|	Fix bug in previous refactoring	Jon Leighton	2010-10-14	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-10-14	160	-1320/+8646
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb
\| * \| \| \| \| \| \| \| \| \| \| \|	Add ↵	Jon Leighton	2010-10-13	3	-4/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactoring ThroughAssociationScope#construct_through_joins	Jon Leighton	2010-10-13	1	-54/+62
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	First bit of support for habtm in through assocs - ↵	Jon Leighton	2010-10-13	6	-30/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes
\| * \| \| \| \| \| \| \| \| \| \| \|	Hook ThroughAssociationScope up to use the AliasTracker class	Jon Leighton	2010-10-13	1	-9/+30
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Some small tweaks on the last commit	Jon Leighton	2010-10-12	2	-19/+12
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Extract aliasing code from JoinDependency and JoinAssociation into a ↵	Jon Leighton	2010-10-12	2	-41/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	separate AliasTracker class. This can then be used by ThroughAssociationScope as well.
\| * \| \| \| \| \| \| \| \| \| \| \|	Add a commented, failing test for using a habtm in a has many through ↵	Jon Leighton	2010-10-12	5	-55/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	association. I want to refactor how aliasing works first.
\| * \| \| \| \| \| \| \| \| \| \| \|	Add test_has_many_through_has_one_through_with_has_many_source_reflection	Jon Leighton	2010-10-12	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵	Jon Leighton	2010-10-12	5	-3/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and modifying ThroughAssociationScope to make it work correctly.
\| * \| \| \| \| \| \| \| \| \| \| \|	Rename some tests for consistency	Jon Leighton	2010-10-12	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|