aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2010-12-2013-98/+714
|\
| * Fix various issues with the :primary_key option in :through associations [#24...Jon Leighton2010-12-151-17/+9
| * Replace rudimentary named_scope with scope. [#6052 state:resolved]Pavel Gorbokon2010-12-151-8/+8
| * Respect the default_scope on a join model when reading a through associationJon Leighton2010-12-163-2/+9
| * Fix hm:t to self table aliasing in construct_scopeErnie Miller2010-12-161-2/+10
| * class names are already strings, so we do not need to call to_s on the string...Aaron Patterson2010-12-161-2/+2
| * build SQL AST nodes rather than generate stringsAaron Patterson2010-12-161-10/+8
| * construct_joins no longer needs an argumentAaron Patterson2010-12-161-1/+1
| * supporting arel AST nodes when building join statementsAaron Patterson2010-12-161-15/+17
| * just copy the joins to the listAaron Patterson2010-12-161-1/+1
| * taking advantage of the JoinSource node in the SQL ASTAaron Patterson2010-12-162-15/+6
| * just use the regexp directlyAaron Patterson2010-12-161-6/+4
| * combine regexpAaron Patterson2010-12-161-4/+2
| * move ivar to initialize, use triple dot rather than minusAaron Patterson2010-12-161-1/+1
| * explicitly set prefixAaron Patterson2010-12-161-1/+1
| * remove lasgn since AST is mutatedAaron Patterson2010-12-161-2/+8
| * use table alias nodes rather than Table nodesAaron Patterson2010-12-101-3/+2
| * use alias nodes to represent table aliasesAaron Patterson2010-12-101-3/+2
| * avoid *args on join_target_tableAaron Patterson2010-12-101-3/+5
| * only quote the table name once per callAaron Patterson2010-12-101-6/+7
| * move join creation a little closer to where it is usedAaron Patterson2010-12-091-3/+3
| * use inject rather than lasgnAaron Patterson2010-12-091-6/+5
| * removing useless lasgnAaron Patterson2010-12-091-1/+1
| * use sort_byAaron Patterson2010-12-081-1/+1
| * just allocate the table in initializeAaron Patterson2010-12-081-6/+4
| * fewer method calls, fewer code branchesAaron Patterson2010-12-081-5/+4
| * only call active_record onceAaron Patterson2010-12-081-2/+4
| * dry up calls to table_aliasesAaron Patterson2010-12-081-4/+6
| * remove code that could never be executedAaron Patterson2010-12-081-4/+0
| * have table_aliases call count_aliases to set the default valueAaron Patterson2010-12-082-5/+3
| * arel ignores the columns parameterAaron Patterson2010-12-081-2/+1
| * passing the ast to a table when the relation is a tableAaron Patterson2010-12-071-2/+0
| * JoinDependency is always created with an AST nowAaron Patterson2010-12-071-4/+10
| * passing the ast to JoinDependencyAaron Patterson2010-12-071-2/+11
| * arel is lazy about column information, so no need to pass it aroundAaron Patterson2010-12-071-1/+1
| * reduce string objects, reduce method callsAaron Patterson2010-12-071-4/+5
| * save the AR reference rather than delegatingAaron Patterson2010-12-071-4/+5
| * remove calls to deprecated methodsAaron Patterson2010-12-021-2/+3
| * removing more calls to deprecated methodsAaron Patterson2010-12-021-2/+3
| * removing some calls to insert on arelAaron Patterson2010-12-021-3/+4
| * no need for selfAaron Patterson2010-12-011-1/+1
| * JoinBase initialize can be deletedAaron Patterson2010-11-302-10/+3
| * removing interpolate_sql from join associationsAaron Patterson2010-11-291-5/+1
| * moving method to subclass that actually uses the methodAaron Patterson2010-11-292-1/+5
| * Partialy revert f1c13b0dd7b22b5f6289ca1a09f1d7a8c7c8584bJosé Valim2010-11-286-18/+18
| * nil check unneeded ht. exvivaSantiago Pastorino2010-11-251-1/+1
| * Remove explicit return.Emilio Tagua2010-11-251-2/+2
| * Use ternary instead explicit return.Emilio Tagua2010-11-251-2/+1
| * Remove return, we are already returning self.Emilio Tagua2010-11-251-6/+6
| * alias should be a SQL literalAaron Patterson2010-11-241-1/+1