Moved adding of limit on deletion and adding of limit on update conditions to GenericCompiler, to provide flexibility to handle db specifics

Signed-off-by: Emilio Tagua <miloops@gmail.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/lib/arel/engines/sql/relations/compiler.rb b/lib/arel/engines/sql/relations/compiler.rb
index c974e43b88..597ed88683 100644
--- a/lib/arel/engines/sql/relations/compiler.rb
+++ b/lib/arel/engines/sql/relations/compiler.rb
@@ -21,11 +21,16 @@ module Arel
           ("#{locked}"                                   unless locked.blank?)
       end
 
-      def limited_update_conditions(conditions)
+      def limited_update_conditions(conditions, taken)
+        conditions << " LIMIT #{taken}"
         quoted_primary_key = engine.quote_table_name(primary_key)
         "WHERE #{quoted_primary_key} IN (SELECT #{quoted_primary_key} FROM #{engine.connection.quote_table_name table.name} #{conditions})"
       end
 
+      def add_limit_on_delete(taken)
+        "LIMIT #{taken}"
+      end
+
       def supports_insert_with_returning?
         false
       end
diff --git a/lib/arel/engines/sql/relations/writes.rb b/lib/arel/engines/sql/relations/writes.rb
index 0a6250a3b9..54eaee9ead 100644
--- a/lib/arel/engines/sql/relations/writes.rb
+++ b/lib/arel/engines/sql/relations/writes.rb
@@ -5,7 +5,7 @@ module Arel
         "DELETE",
         "FROM #{table_sql}",
         ("WHERE #{wheres.collect(&:to_sql).join(' AND ')}" unless wheres.blank? ),
-        ("LIMIT #{taken}"                                  unless taken.blank?  )
+        (compiler.add_limit_on_delete(taken)               unless taken.blank?  )
     end
   end
 
@@ -68,9 +68,7 @@ module Arel
       conditions << " ORDER BY #{order_clauses.join(', ')}" unless orders.blank?
 
       unless taken.blank?
-        conditions << " LIMIT #{taken}"
-
-        conditions = compiler.limited_update_conditions(conditions)
+        conditions = compiler.limited_update_conditions(conditions,taken)
       end
 
       conditions