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

	Commit message (Collapse)	Author	Age	Files	Lines
*	applies new string literal convention in activerecord/lib	Xavier Noria	2016-08-06	1	-1/+1
\| \| \| \| \|	The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
*	Merge branch 'master' into joindep	Aaron Patterson	2013-10-15	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: use the cached arel table Fix typo in the changelog entry Don't remove the select values to add they back again Pluck on NullRelation accepts a list of columns Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
\| *	use the cached arel table	Aaron Patterson	2013-10-15	1	-1/+1
\| \|
* \|	move column_names_with_alias on to the alias cache object	Aaron Patterson	2013-10-14	1	-4/+0
\| \|
* \|	pull parent and alias tacker from the nodes.	Aaron Patterson	2013-10-11	1	-4/+0
\|/ \| \| \|	For now, we'll set the tables on the nodes manually.
*	make node search more efficient	Aaron Patterson	2013-10-09	1	-0/+5
\| \| \| \| \| \|	Rather than search every node in the tree, comparing that node and all of its parents every time, start at the root from both sides and work our way down the tree
*	remove == so we can see where walking up parents occurs	Aaron Patterson	2013-10-09	1	-5/+0
\|
*	push parent up to the superclass	Aaron Patterson	2013-10-09	1	-0/+4
\| \| \| \|	We always want a linked list back to the root node.
*	require the files we need so the classes are stand-alone	Aaron Patterson	2013-10-03	1	-0/+2
\|
*	changed variable name active_record => base_klass	Neeraj Singh	2013-04-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Current code stores the klass name in active_record and this is used throughout. While reviewing the code time and again I had the mental picture of active_record being an instance of a klass. However here the actual klass is being stored in @active_record. Secondly at two different places while referring to @active_record the comment refers to it as base klass. All this points to active_record being not the best variable name. So I thought it is better to replace active_record with base_klass. This change is confined to JoinDependency, JoinBase, JoinPart and JoinAssociation - all joining related work.
*	Move JoinDependency and friends from ↵	Jon Leighton	2011-02-28	1	-0/+24
	ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations