Removed support for deprecated `delete_sql` in associations.

2 files changed, 11 insertions, 16 deletions

diff --git a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
index 26b57cae0a..64ee24c7c6 100644
--- a/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rb
@@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder
     end
 
     def valid_options
-      super + [:join_table, :association_foreign_key, :delete_sql]
+      super + [:join_table, :association_foreign_key]
     end
 
     def build
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index fc0d6f7598..b2e6c708bf 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -35,22 +35,17 @@ module ActiveRecord
         end
 
         def delete_records(records, method)
-          if sql = options[:delete_sql]
-            records = load_target if records == :all
-            records.each { |record| owner.class.connection.delete(interpolate(sql, record)) }
-          else
-            relation  = join_table
-            condition = relation[reflection.foreign_key].eq(owner.id)
-
-            unless records == :all
-              condition = condition.and(
-                relation[reflection.association_foreign_key]
-                  .in(records.map { |x| x.id }.compact)
-              )
-            end
-
-            owner.class.connection.delete(relation.where(condition).compile_delete)
+          relation  = join_table
+          condition = relation[reflection.foreign_key].eq(owner.id)
+
+          unless records == :all
+            condition = condition.and(
+              relation[reflection.association_foreign_key]
+                .in(records.map { |x| x.id }.compact)
+            )
           end
+
+          owner.class.connection.delete(relation.where(condition).compile_delete)
         end
 
         def invertible_for?(record)