Removed support for deprecated `delete_sql` in associations.

5 files changed, 15 insertions, 46 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 8f858ce1e8..359dc91d4f 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Removed support for deprecated `delete_sql` in associations.
+
+    *Neeraj Singh*
+
 *   Removed support for deprecated `insert_sql` in associations.
 
     *Neeraj Singh*
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)
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index 3ff1aeb7fe..0f9af8a0c3 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -351,31 +351,6 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 0, david.projects(true).size
   end
 
-  def test_deleting_with_sql
-    david = Developer.find(1)
-    active_record = Project.find(1)
-    active_record.developers.reload
-    assert_equal 3, active_record.developers_by_sql.size
-
-    active_record.developers_by_sql.delete(david)
-    assert_equal 2, active_record.developers_by_sql(true).size
-  end
-
-  def test_deleting_array_with_sql
-    active_record = Project.find(1)
-    active_record.developers.reload
-    assert_equal 3, active_record.developers_by_sql.size
-
-    active_record.developers_by_sql.delete(Developer.all)
-    assert_equal 0, active_record.developers_by_sql(true).size
-  end
-
-  def test_deleting_all_with_sql
-    project = Project.find(1)
-    project.developers_by_sql.delete_all
-    assert_equal 0, project.developers_by_sql.size
-  end
-
   def test_deleting_all
     david = Developer.find(1)
     david.projects.reload
diff --git a/activerecord/test/models/project.rb b/activerecord/test/models/project.rb
index 9e8e3e04d2..c094b726b4 100644
--- a/activerecord/test/models/project.rb
+++ b/activerecord/test/models/project.rb
@@ -7,11 +7,6 @@ class Project < ActiveRecord::Base
   has_and_belongs_to_many :developers_named_david, -> { where("name = 'David'").distinct }, :class_name => "Developer"
   has_and_belongs_to_many :developers_named_david_with_hash_conditions, -> { where(:name => 'David').distinct }, :class_name => "Developer"
   has_and_belongs_to_many :salaried_developers, -> { where "salary > 0" }, :class_name => "Developer"
-
-  ActiveSupport::Deprecation.silence do
-    has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => proc { |record| "DELETE FROM developers_projects WHERE project_id = #{id} AND developer_id = #{record.id}" }
-  end
-
   has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"},
                             :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"},
                             :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"},