Merge branch '2-0-stable'

* 2-0-stable:
  quoting limit nodes
  Make "not" apply to the whole sub-expression when generating sql.

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/arel/visitors/mysql.rb b/lib/arel/visitors/mysql.rb
index 143b4d36f4..ace8fb0979 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 #{o.limit}" if o.limit),
+          ("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 553ee91bf9..01fbda75b9 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 #{o.limit}" if o.limit),
+            ("LIMIT #{visit o.limit}" if o.limit),
             (visit(o.offset) if o.offset),
           ].compact.join ' '
         else