diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-13 10:44:34 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-13 10:53:19 -0800 |
| commit | bd51790895fc75a3b4e19e8dd7aa6dc389d77068 (patch) | |
| tree | ef3ccd2dcfd84f618116b99bc2ede21b69b2ccf5 /activerecord/lib/active_record/associations.rb | |
| parent | 0da71980cd61aa6297749d0ea8520785c9a5280f (diff) | |
| download | rails-bd51790895fc75a3b4e19e8dd7aa6dc389d77068.tar.gz rails-bd51790895fc75a3b4e19e8dd7aa6dc389d77068.tar.bz2 rails-bd51790895fc75a3b4e19e8dd7aa6dc389d77068.zip | |
Split arel_table into method to get a relation and another to memoize the default relation.
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 6c5e25010f..fc18b53b9d 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1698,7 +1698,7 @@ module ActiveRecord def construct_finder_arel_with_included_associations(options, join_dependency) scope = scope(:find) - relation = arel_table((scope && scope[:from]) || options[:from]) + relation = arel_table_for((scope && scope[:from]) || options[:from]) for association in join_dependency.join_associations relation = association.join_relation(relation) @@ -1741,7 +1741,7 @@ module ActiveRecord def construct_finder_sql_for_association_limiting(options, join_dependency) scope = scope(:find) - relation = arel_table(options[:from]) + relation = arel_table_for(options[:from]) for association in join_dependency.join_associations relation = association.join_relation(relation) |