aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-03-25 10:01:44 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-03-25 10:01:44 -0700
commit2fd000910915e665a0206ec21281a20dfb69bc51 (patch)
tree014a11ee459ad3c75d910849b2ae77ff3538bf39
parent6d47c4cae51fe5fd04ef999de96f54138cae7f88 (diff)
downloadrails-2fd000910915e665a0206ec21281a20dfb69bc51.tar.gz
rails-2fd000910915e665a0206ec21281a20dfb69bc51.tar.bz2
rails-2fd000910915e665a0206ec21281a20dfb69bc51.zip
take in to account quoted and translated values
-rw-r--r--lib/arel/select_manager.rb2
-rw-r--r--test/test_factory_methods.rb2
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