aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-16 13:35:07 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-16 13:35:07 -0300
commitf4a23567e2612fc72ff3655a9169ed032610fc84 (patch)
treed3f5500bc75916584d82706e04fab50b776f0f05 /activerecord/lib/active_record/associations.rb
parent634f6713ee15c6fd958bafc7a3422acac2e3343f (diff)
downloadrails-f4a23567e2612fc72ff3655a9169ed032610fc84.tar.gz
rails-f4a23567e2612fc72ff3655a9169ed032610fc84.tar.bz2
rails-f4a23567e2612fc72ff3655a9169ed032610fc84.zip
Added ActiveRecord::Base#(where|join|project|group|order|take|skip) methods.
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 31d3a89b9d..a4228e2a2a 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1599,16 +1599,16 @@ module ActiveRecord
conditions = construct_conditions(options[:conditions], scope) || ''
conditions << construct_limited_ids_condition(conditions, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
- arel = arel_table((scope && scope[:from]) || options[:from] || table_name).
- join(joins).
- where(conditions).
- project(column_aliases(join_dependency)).
- group(construct_group(options[:group], options[:having], scope)).
- order(construct_order(options[:order], scope))
+ arel_table((scope && scope[:from]) || options[:from])
+ join(joins)
+ where(conditions)
+ project(column_aliases(join_dependency))
+ group(construct_group(options[:group], options[:having], scope))
+ order(construct_order(options[:order], scope))
- arel = arel.take(construct_limit(options, scope)) if using_limitable_reflections?(join_dependency.reflections)
+ take(construct_limit(options[:limit], scope)) if using_limitable_reflections?(join_dependency.reflections)
- return sanitize_sql(arel.to_sql)
+ return sanitize_sql(arel_relation.to_sql)
end
def construct_limited_ids_condition(where, options, join_dependency)