From a8c888cca93021b71c887f5d4a01936a9e28389f Mon Sep 17 00:00:00 2001
From: Neeraj Singh <neerajdotname@gmail.com>
Date: Tue, 2 Jul 2013 01:07:02 +0530
Subject: Removed deprecated options for assocations

Deprecated options `delete_sql`, `insert_sql`, `finder_sql` and `counter_sql`
have been deleted.
---
 activerecord/CHANGELOG.md                                    |  8 ++++++++
 .../associations/builder/collection_association.rb           |  9 ---------
 .../associations/builder/has_and_belongs_to_many.rb          | 10 ----------
 .../has_and_belongs_to_many_associations_test.rb             | 12 ------------
 .../test/cases/associations/has_many_associations_test.rb    | 10 ----------
 5 files changed, 8 insertions(+), 41 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6154c0b198..72b469c47c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,11 @@
+*   Removed deprecated options `delete_sql` and `insert_sql` from HABTM
+    association.
+
+    Removed deprecated options `finder_sql` and `counter_sql` from
+    collection association.
+
+    *Neeraj Singh*
+
 *   Remove deprecated `ActiveRecord::Base#connection` method.
     Make sure to access it via the class.
 
diff --git a/activerecord/lib/active_record/associations/builder/collection_association.rb b/activerecord/lib/active_record/associations/builder/collection_association.rb
index 9c6690b721..c24432c863 100644
--- a/activerecord/lib/active_record/associations/builder/collection_association.rb
+++ b/activerecord/lib/active_record/associations/builder/collection_association.rb
@@ -20,7 +20,6 @@ module ActiveRecord::Associations::Builder
     end
 
     def build
-      show_deprecation_warnings
       wrap_block_extension
       reflection = super
       CALLBACKS.each { |callback_name| define_callback(callback_name) }
@@ -31,14 +30,6 @@ module ActiveRecord::Associations::Builder
       true
     end
 
-    def show_deprecation_warnings
-      [:finder_sql, :counter_sql].each do |name|
-        if options.include? name
-          ActiveSupport::Deprecation.warn("The :#{name} association option is deprecated. Please find an alternative (such as using scopes).")
-        end
-      end
-    end
-
     def wrap_block_extension
       if block_extension
         @extension_module = mod = Module.new(&block_extension)
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 bdac02b5bf..2a0d16ad2c 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
@@ -14,16 +14,6 @@ module ActiveRecord::Associations::Builder
       reflection
     end
 
-    def show_deprecation_warnings
-      super
-
-      [:delete_sql, :insert_sql].each do |name|
-        if options.include? name
-          ActiveSupport::Deprecation.warn("The :#{name} association option is deprecated. Please find an alternative (such as using has_many :through).")
-        end
-      end
-    end
-
     def define_destroy_hook
       name = self.name
       model.send(:include, Module.new {
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 84bdca3a97..e23780174b 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
@@ -845,18 +845,6 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     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
-
   test "has and belongs to many associations on new records use null relations" do
     projects = Developer.new.projects
     assert_no_queries do
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 8f5e18b863..8843ef6d2e 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -1774,16 +1774,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     end
   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
-
   test "has many associations on new records use null relations" do
     post = Post.new
 
-- 
cgit v1.2.3