aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-07-20 09:14:14 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-07-20 09:14:14 -0700
commit9fe94dd0c16facf2c9cfac9ae1166050b6f41cee (patch)
tree445891803e700ca4006daf358a804b95d175c392 /lib
parent2edbb4b96f5d8ed52357e23ad02c64b8e7a68106 (diff)
downloadrails-9fe94dd0c16facf2c9cfac9ae1166050b6f41cee.tar.gz
rails-9fe94dd0c16facf2c9cfac9ae1166050b6f41cee.tar.bz2
rails-9fe94dd0c16facf2c9cfac9ae1166050b6f41cee.zip
avoid double call to to_s, avoid present?
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/engines/sql/relations/table.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/arel/engines/sql/relations/table.rb b/lib/arel/engines/sql/relations/table.rb
index f09457f65a..c83ce1e5e9 100644
--- a/lib/arel/engines/sql/relations/table.rb
+++ b/lib/arel/engines/sql/relations/table.rb
@@ -12,7 +12,11 @@ module Arel
if options.is_a?(Hash)
@options = options
@engine = options[:engine] || Table.engine
- @table_alias = options[:as].to_s if options[:as].present? && options[:as].to_s != @name
+
+ if options[:as]
+ as = options[:as].to_s
+ @table_alias = as unless as == @name
+ end
else
@engine = options # Table.new('foo', engine)
end