aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-01-03 16:19:57 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-01-03 16:19:57 -0800
commitf5e09790550fcb7d413d495be25f8fe74a571850 (patch)
treee69d675e1eec65a3c4dc3df5cf63350675bf633a /lib/arel
parentef29263428eb2aa1fdc2b6b020f0d153fd17b5f3 (diff)
downloadrails-f5e09790550fcb7d413d495be25f8fe74a571850.tar.gz
rails-f5e09790550fcb7d413d495be25f8fe74a571850.tar.bz2
rails-f5e09790550fcb7d413d495be25f8fe74a571850.zip
adding better tests surrounding limits in adapter visitors
Diffstat (limited to 'lib/arel')
-rw-r--r--lib/arel/visitors/mysql.rb2
-rw-r--r--lib/arel/visitors/postgresql.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb
index b37d76f710..e90161eee4 100644
--- a/lib/arel/visitors/mysql.rb
+++ b/lib/arel/visitors/mysql.rb
@@ -25,7 +25,7 @@ module Arel
("SET #{o.values.map { |value| visit value }.join ', '}" unless o.values.empty?),
("WHERE #{o.wheres.map { |x| visit x }.join ' AND '}" unless o.wheres.empty?),
("ORDER BY #{o.orders.map { |x| visit x }.join(', ')}" unless o.orders.empty?),
- ("LIMIT #{visit o.limit}" if o.limit),
+ (visit(o.limit) if o.limit),
].compact.join ' '
end
diff --git a/lib/arel/visitors/postgresql.rb b/lib/arel/visitors/postgresql.rb
index 01fbda75b9..0e82a703ca 100644
--- a/lib/arel/visitors/postgresql.rb
+++ b/lib/arel/visitors/postgresql.rb
@@ -17,7 +17,7 @@ module Arel
[
"SELECT * FROM (#{sql}) AS id_list",
"ORDER BY #{aliased_orders(o.orders).join(', ')}",
- ("LIMIT #{visit o.limit}" if o.limit),
+ (visit(o.limit) if o.limit),
(visit(o.offset) if o.offset),
].compact.join ' '
else