aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorKen Collins <ken@metaskills.net>2011-02-09 11:07:25 -0500
committerAaron Patterson <aaron.patterson@gmail.com>2011-02-09 08:33:40 -0800
commit56fb3b1594d97fa00dd8d8d95f1d5bf7c30380ee (patch)
tree81235df49ce56539cafa5df4a704293806696437 /activerecord/test
parentc6b4ef082f80255c1e3ec6e4feb1d199ed1e7efa (diff)
downloadrails-56fb3b1594d97fa00dd8d8d95f1d5bf7c30380ee.tar.gz
rails-56fb3b1594d97fa00dd8d8d95f1d5bf7c30380ee.tar.bz2
rails-56fb3b1594d97fa00dd8d8d95f1d5bf7c30380ee.zip
Allow limit values to accept an ARel SQL literal.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/base_test.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 2cbff6a5e1..5b162f4f6f 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -59,7 +59,7 @@ class BasicsTest < ActiveRecord::TestCase
assert_nil Edge.primary_key
end
- unless current_adapter?(:PostgreSQLAdapter) || current_adapter?(:OracleAdapter)
+ unless current_adapter?(:PostgreSQLAdapter,:OracleAdapter,:SQLServerAdapter)
def test_limit_with_comma
assert_nothing_raised do
Topic.limit("1,2").all
@@ -94,7 +94,13 @@ class BasicsTest < ActiveRecord::TestCase
Topic.limit("1, 7 procedure help()").all
end
end
-
+
+ unless current_adapter?(:MysqlAdapter)
+ def test_limit_should_allow_sql_literal
+ assert_equal 1, Topic.limit(Arel.sql('2-1')).all.length
+ end
+ end
+
def test_select_symbol
topic_ids = Topic.select(:id).map(&:id).sort
assert_equal Topic.find(:all).map(&:id).sort, topic_ids