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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix "last equality wins" logic in relation merge	Ernie Miller	2012-08-19	1	-10/+5
\| \| \| \| \| \|	This is a real fix (as compared to the band-aid in b127d86c), which uses the recently-added equality methods for ARel nodes. It has the side benefit of simplifying the merge code a bit.
*	Fix merge error when Equality LHS is non-attribute	Ernie Miller	2012-08-17	1	-2/+5
\| \| \| \| \| \| \| \| \|	This is at best a band-aid for a more proper fix, since it won't truly handle the removal of the previous equality condition of these other nodes. I'm planning to put in some work on ARel toward supporting that goal. Related: rails/arel#130, ernie/squeel#153, ernie/squeel#156
*	load active_support/core_ext/object/blank in active_support/rails	Xavier Noria	2012-08-02	1	-1/+0
\|
*	Add nodoc to HashMerger and Merger	Oscar Del Ben	2012-07-17	1	-2/+2
\|
*	Relation#from to accept other Relation objects	Radoslav Stankov	2012-05-17	1	-1/+2
\| \| \| \|	Record.from("(#{sub_query.to_sql})") -> Record.from(sub_query) Record.from("(#{sub_query.to_sql}) a") -> Record.from(sub_query, :a)
*	Revert "Merge pull request #5494 from ↵	Jon Leighton	2012-05-05	1	-28/+3
\| \| \| \| \| \| \|	armstrjare/active_record_relation_keep_association_join_context_on_merge" This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing changes made to 58a49875df63729f07a9a81d1ee349087d258df5.
*	Allow ActiveRecord::Relation merges to maintain context of joined associations	Jared Armstrong	2012-05-04	1	-3/+28
\|
*	fix interpolation for hash merging	Jon Leighton	2012-04-25	1	-15/+24
\|
*	allow merging a single where value	Jon Leighton	2012-04-25	1	-1/+1
\|
*	now we can just manipulate the values hash in #only and #except	Jon Leighton	2012-04-13	1	-10/+1
\|
*	remove apply_finder_options call from AssociationScope	Jon Leighton	2012-04-13	1	-1/+1
\|
*	Make Relation#extending work like other value methods	Jon Leighton	2012-04-13	1	-3/+1
\|
*	assert valid keys	Jon Leighton	2012-04-13	1	-0/+5
\|
*	Allow Relation#merge to take a hash	Jon Leighton	2012-04-13	1	-44/+69
\|
*	we have no need for the ASSOCIATION_METHODS constant	Jon Leighton	2012-04-13	1	-1/+1
\|
*	refactoring	Jon Leighton	2012-04-13	1	-36/+45
\|
*	Extract clusterfuck method for surgery	Jon Leighton	2012-04-13	1	-0/+84