aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-12-07 15:00:00 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-12-07 15:00:00 -0800
commitdfc66f44218aa2ef2bd768000fd6e83b4fd8c96a (patch)
tree91f574d6593a9fff28365974dc384046df861e04 /lib
parent79657a3512335d5de77fd7d1443cad3b00e2816b (diff)
downloadrails-dfc66f44218aa2ef2bd768000fd6e83b4fd8c96a.tar.gz
rails-dfc66f44218aa2ef2bd768000fd6e83b4fd8c96a.tar.bz2
rails-dfc66f44218aa2ef2bd768000fd6e83b4fd8c96a.zip
renaming froms to from
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/select_manager.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index 07de9fe224..bbe41ac4f1 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -66,8 +66,8 @@ module Arel
# FIXME: this is a hack to support
# test_with_two_tables_in_from_without_getting_double_quoted
# from the AR tests.
- if @ctx.froms
- source = @ctx.froms
+ if @ctx.from
+ source = @ctx.from
if Nodes::SqlLiteral === table && Nodes::Join === source
source.left = table
@@ -75,7 +75,7 @@ module Arel
end
end
- @ctx.froms = table
+ @ctx.from = table
self
end