From 82944b95a909965ddec189058fb2040dcf0aa54a Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 10 Dec 2010 11:24:05 -0800
Subject: eliminate lasgns
---
.../lib/active_record/relation/query_methods.rb | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
(limited to 'activerecord/lib')
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 1e6a928da3..b2f741026b 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -165,23 +165,23 @@ module ActiveRecord
def build_arel
arel = table.from table
- arel = build_joins(arel, @joins_values) unless @joins_values.empty?
+ build_joins(arel, @joins_values) unless @joins_values.empty?
- arel = collapse_wheres(arel, (@where_values - ['']).uniq)
+ collapse_wheres(arel, (@where_values - ['']).uniq)
- arel = arel.having(*@having_values.uniq.reject{|h| h.blank?}) unless @having_values.empty?
+ arel.having(*@having_values.uniq.reject{|h| h.blank?}) unless @having_values.empty?
- arel = arel.take(@limit_value) if @limit_value
- arel = arel.skip(@offset_value) if @offset_value
+ arel.take(@limit_value) if @limit_value
+ arel.skip(@offset_value) if @offset_value
- arel = arel.group(*@group_values.uniq.reject{|g| g.blank?}) unless @group_values.empty?
+ arel.group(*@group_values.uniq.reject{|g| g.blank?}) unless @group_values.empty?
- arel = arel.order(*@order_values.uniq.reject{|o| o.blank?}) unless @order_values.empty?
+ arel.order(*@order_values.uniq.reject{|o| o.blank?}) unless @order_values.empty?
- arel = build_select(arel, @select_values.uniq)
+ build_select(arel, @select_values.uniq)
- arel = arel.from(@from_value) if @from_value
- arel = arel.lock(@lock_value) if @lock_value
+ arel.from(@from_value) if @from_value
+ arel.lock(@lock_value) if @lock_value
arel
end
--
cgit v1.2.3