github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't waste time building relations if there are no values presents. [#4860 state:resolved]

Browse Source 
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Emilio Tagua
2010-06-20 15:51:49 -03:00
committed by José Valim
parent 756d77622b
commit 7b7cedcb8d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/relation/query_methods.rb
View File

@@ -130,14 +130,14 @@ module ActiveRecord
end
end
arel = arel.having(*@having_values.uniq.select{|h| h.present?})
arel = arel.having(*@having_values.uniq.select{|h| h.present?}) if @having_values.present?
arel = arel.take(@limit_value) if @limit_value.present?
arel = arel.skip(@offset_value) if @offset_value.present?
arel = arel.group(*@group_values.uniq.select{|g| g.present?})
arel = arel.group(*@group_values.uniq.select{|g| g.present?}) if @group_values.present?
arel = arel.order(*@order_values.uniq.select{|o| o.present?}.map(&:to_s))
arel = arel.order(*@order_values.uniq.select{|o| o.present?}.map(&:to_s)) if @order_values.present?
selects = @select_values.uniq
@@ -150,7 +150,7 @@ module ActiveRecord
arel = arel.project(@klass.quoted_table_name + '.*')
end
arel = @from_value.present? ? arel.from(@from_value) : arel.from(@klass.quoted_table_name)
arel = arel.from(@from_value) if @from_value.present?
case @lock_value
when TrueClass