Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.

2 files changed, 40 insertions, 9 deletions

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 bacab8d2f2..dc7d104524 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
@@ -67,12 +67,15 @@ end
 
 class DeveloperWithCounterSQL < ActiveRecord::Base
   self.table_name = 'developers'
-  has_and_belongs_to_many :projects,
-    :class_name => "DeveloperWithCounterSQL",
-    :join_table => "developers_projects",
-    :association_foreign_key => "project_id",
-    :foreign_key => "developer_id",
-    :counter_sql => proc { "SELECT COUNT(*) AS count_all FROM projects INNER JOIN developers_projects ON projects.id = developers_projects.project_id WHERE developers_projects.developer_id =#{id}" }
+
+  ActiveSupport::Deprecation.silence do
+    has_and_belongs_to_many :projects,
+      :class_name => "DeveloperWithCounterSQL",
+      :join_table => "developers_projects",
+      :association_foreign_key => "project_id",
+      :foreign_key => "developer_id",
+      :counter_sql => proc { "SELECT COUNT(*) AS count_all FROM projects INNER JOIN developers_projects ON projects.id = developers_projects.project_id WHERE developers_projects.developer_id =#{id}" }
+  end
 end
 
 class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
@@ -854,4 +857,16 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     developer = project.developers.build
     assert project.developers.include?(developer)
   end
+
+  test ":insert_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    def klass.name; 'Foo'; end
+    assert_deprecated { klass.has_and_belongs_to_many :posts, :insert_sql => 'lol' }
+  end
+
+  test ":delete_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    def klass.name; 'Foo'; end
+    assert_deprecated { klass.has_and_belongs_to_many :posts, :delete_sql => 'lol' }
+  end
 end
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index a51ce26117..94fc48276f 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -22,7 +22,9 @@ require 'models/engine'
 
 class HasManyAssociationsTestForCountWithFinderSql < ActiveRecord::TestCase
   class Invoice < ActiveRecord::Base
-    has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT line_items.* from line_items"
+    ActiveSupport::Deprecation.silence do
+      has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT line_items.* from line_items"
+    end
   end
   def test_should_fail
     assert_raise(ArgumentError) do
@@ -33,7 +35,9 @@ end
 
 class HasManyAssociationsTestForCountWithCountSql < ActiveRecord::TestCase
   class Invoice < ActiveRecord::Base
-    has_many :custom_line_items, :class_name => 'LineItem', :counter_sql => "SELECT COUNT(*) line_items.* from line_items"
+    ActiveSupport::Deprecation.silence do
+      has_many :custom_line_items, :class_name => 'LineItem', :counter_sql => "SELECT COUNT(*) line_items.* from line_items"
+    end
   end
   def test_should_fail
     assert_raise(ArgumentError) do
@@ -44,7 +48,9 @@ end
 
 class HasManyAssociationsTestForCountDistinctWithFinderSql < ActiveRecord::TestCase
   class Invoice < ActiveRecord::Base
-    has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT DISTINCT line_items.amount from line_items"
+    ActiveSupport::Deprecation.silence do
+      has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT DISTINCT line_items.amount from line_items"
+    end
   end
 
   def test_should_count_distinct_results
@@ -1698,4 +1704,14 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal [bulb1, bulb3], car.bulbs
     assert_equal [bulb1, bulb3], result
   end
+
+  test ":finder_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    assert_deprecated { klass.has_many :foo, :finder_sql => 'lol' }
+  end
+
+  test ":counter_sql is deprecated" do
+    klass = Class.new(ActiveRecord::Base)
+    assert_deprecated { klass.has_many :foo, :counter_sql => 'lol' }
+  end
 end