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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \|	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	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-8/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	through associations
\| * \| \| \| \| \| \| \| \| \|	Properly support conditions on any of the reflections involved in a nested ↵	Jon Leighton	2010-10-19	3	-76/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-9/+40
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix small bug which was shown by the last commit	Jon Leighton	2010-10-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Support preloading nested through associations (using the default ↵	Jon Leighton	2010-10-15	1	-61/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	multi-query strategy)
\| * \| \| \| \| \| \| \| \| \|	Added ↵	Jon Leighton	2010-10-14	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	15	-121/+113
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb
\| * \| \| \| \| \| \| \| \| \| \|	Add ↵	Jon Leighton	2010-10-13	1	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-23/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-46/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	association. I want to refactor how aliasing works first.
\| * \| \| \| \| \| \| \| \| \| \|	Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵	Jon Leighton	2010-10-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and modifying ThroughAssociationScope to make it work correctly.
\| * \| \| \| \| \| \| \| \| \| \|	Support has_one through assocs as the source association	Jon Leighton	2010-10-12	1	-10/+21
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	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	2	-89/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	10	-66/+96
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactoring JoinDependency and friends. This improves the code (IMO) ↵	Jon Leighton	2010-10-06	3	-197/+313
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \| \| \| \|	Add support for table aliasing, with a test that needs aliasing in order to ↵	Jon Leighton	2010-10-02	1	-13/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-47/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-19/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	structure of ThroughAssociationScope rather than layering a module over the top
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into nested_has_many_through_2	Jon Leighton	2010-09-30	19	-166/+139
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Initial nested_has_many_through support [#1152]	Bodaniel Jeanes	2010-09-26	4	-3/+162
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵	John Mileham	2011-03-03	1	-14/+26
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	17	-440/+565
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	use an attribute rather than a SQL literal	Aaron Patterson	2011-02-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	removing limits and offsets from COUNT queries unless both are specified. ↵	Aaron Patterson	2011-02-25	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[#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	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix observer callbacks firing multiple times on descendant instances	Kamal Fariz Mahyuddin	2011-02-22	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	We're in 2011, let's update our license	Prem Sichanugrist	2011-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* \| \| \| \| \| \| \| \| \| \| \| \|	Relation will delegate to AR::Base which already uses the Dynamic finders, ↵	Aaron Patterson	2011-02-22	1	-8/+3
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	so eliminate duplicate calls
* \| \| \| \| \| \| \| \| \| \| \|	Use proper objects to do the work to build the associations (adding methods, ↵	Jon Leighton	2011-02-21	13	-406/+537
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.