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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \|	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	29	-163/+450
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add test_has_many_through_has_one_through	Jon Leighton	2010-10-12	2	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Support has_one through assocs as the source association	Jon Leighton	2010-10-12	7	-20/+71
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	A load of tests that need to be written	Jon Leighton	2010-10-12	1	-0/+63
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Refactoring to remove duplication introduced by the last commit	Jon Leighton	2010-10-10	1	-160/+145
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add support for nested through associations in JoinAssociation. Hence ↵	Jon Leighton	2010-10-09	11	-94/+175
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into nested_has_many_through	Jon Leighton	2010-10-06	15	-67/+147
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactoring JoinDependency and friends. This improves the code (IMO) ↵	Jon Leighton	2010-10-06	10	-209/+356
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	including adding some explanatory comments, but more importantly structures it in such a way as to allow a JoinAssociation to produce an arbitrary number of actual joins, which will be necessary for nested has many through support. Also added 3 tests covering functionality which existed but was not previously covered.
\| * \| \| \| \| \| \| \| \| \| \| \|	A failing test for a nested has many through association loaded via ↵	Jon Leighton	2010-10-05	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Foo.joins(:bar)
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix the tests (I have actually verified that these are also the 'right' ↵	Jon Leighton	2010-10-03	6	-24/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes, rather than just making the tests pass again)
\| * \| \| \| \| \| \| \| \| \| \| \|	Add support for table aliasing, with a test that needs aliasing in order to ↵	Jon Leighton	2010-10-02	7	-15/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism).
\| * \| \| \| \| \| \| \| \| \| \| \|	Integrate nested support into ThroughAssociationScope, using my concept of ↵	Jon Leighton	2010-10-02	5	-59/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generating a 'chain' of reflections to be joined. It seems to work at the moment, all existing tests are passing. There may be further complications as we add more test cases for nested associations, though.
\| * \| \| \| \| \| \| \| \| \| \| \|	Started implementing nested :through associations by using the existing ↵	Jon Leighton	2010-10-01	4	-32/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	structure of ThroughAssociationScope rather than layering a module over the top
\| * \| \| \| \| \| \| \| \| \| \| \|	Prevent ↵	Jon Leighton	2010-09-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test_has_many_through_a_has_many_through_association_on_through_reflection failing for me due to ordering of the results
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into nested_has_many_through_2	Jon Leighton	2010-09-30	33	-224/+350
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Initial nested_has_many_through support [#1152]	Bodaniel Jeanes	2010-09-26	10	-15/+220
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵	John Mileham	2011-03-03	3	-25/+80
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	counting.
* \| \| \| \| \| \| \| \| \| \| \| \|	Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵	Alexander Uvarov	2011-03-01	1	-0/+11
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord, so it's flexible now [#6428 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \|	Move JoinDependency and friends from ↵	Jon Leighton	2011-02-28	11	-626/+618
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
* \| \| \| \| \| \| \| \| \| \| \|	Rewrote AssociationPreload.	Jon Leighton	2011-02-28	21	-458/+583
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	skip this on oracle	Aaron Patterson	2011-02-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	use an attribute rather than a SQL literal	Aaron Patterson	2011-02-26	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	removing limits and offsets from COUNT queries unless both are specified. ↵	Aaron Patterson	2011-02-25	4	-1/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[#6268 state:resolved]
* \| \| \| \| \| \| \| \| \| \| \|	only take the limit if there is a limit to take	Aaron Patterson	2011-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-02-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix missing inheritance from AR::Base in docs	Josep M. Bach	2011-02-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses	Eric Allam	2011-02-24	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	observers leak across tests, so rather than modify the object, we should ↵	Aaron Patterson	2011-02-23	1	-6/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	just count the number of times the observer was called
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix observer callbacks firing multiple times on descendant instances	Kamal Fariz Mahyuddin	2011-02-22	2	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	We're in 2011, let's update our license	Prem Sichanugrist	2011-02-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \| \| \| \| \| \| \| \| \| \| \| \|	expectations change when using IM. Change oracle tests to reflect that	Aaron Patterson	2011-02-22	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Relation will delegate to AR::Base which already uses the Dynamic finders, ↵	Aaron Patterson	2011-02-22	1	-8/+3
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	so eliminate duplicate calls
* \| \| \| \| \| \| \| \| \| \| \|	adding a test case for custom locking	Aaron Patterson	2011-02-21	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Use proper objects to do the work to build the associations (adding methods, ↵	Jon Leighton	2011-02-21	15	-418/+553
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	callbacks etc) rather than calling a whole bunch of methods with rather long names.
* \| \| \| \| \| \| \| \| \| \| \|	Rename target_klass to klass	Jon Leighton	2011-02-21	3	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Delegate through_reflection and source_reflection to reflection	Jon Leighton	2011-02-21	3	-34/+34
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Delegate Association#options to the reflection, and replace ↵	Jon Leighton	2011-02-21	8	-47/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'reflection.options' with 'options'. Also add through_options and source_options methods for through associations.
* \| \| \| \| \| \| \| \| \| \| \|	Singular associations no longer use a proxy, so no need to check for the ↵	Jon Leighton	2011-02-21	3	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	proxy type on assignment.