Merge branch 'rm_a' into ww2lin-rm_a

* rm_a:
  take in to account quoted and translated values

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb
index cd84e263ad..5ab2778778 100644
--- a/lib/arel/select_manager.rb
+++ b/lib/arel/select_manager.rb
@@ -17,7 +17,7 @@ module Arel
     end
 
     def limit
-      @ast.limit && @ast.limit.expr
+      @ast.limit && @ast.limit.expr.expr
     end
     alias :taken :limit
 
diff --git a/test/test_factory_methods.rb b/test/test_factory_methods.rb
index 64d747610b..3e23b090b4 100644
--- a/test/test_factory_methods.rb
+++ b/test/test_factory_methods.rb
@@ -37,7 +37,7 @@ module Arel
         lower = @factory.lower :one
         assert_instance_of Nodes::NamedFunction, lower
         assert_equal 'LOWER', lower.name
-        assert_equal [:one], lower.expressions
+        assert_equal [:one], lower.expressions.map(&:expr)
       end
     end
   end