Removed support for deprecated `counter_sql`

3 files changed, 1 insertions, 61 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 e23780174b..7862fe3bf4 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
@@ -65,19 +65,6 @@ class DeveloperWithSymbolsForKeys < ActiveRecord::Base
     :foreign_key => "developer_id"
 end
 
-class DeveloperWithCounterSQL < ActiveRecord::Base
-  self.table_name = 'developers'
-
-  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
   fixtures :accounts, :companies, :categories, :posts, :categories_posts, :developers, :projects, :developers_projects,
            :parrots, :pirates, :parrots_pirates, :treasures, :price_estimates, :tags, :taggings
@@ -791,14 +778,6 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
     assert_equal 2, david.projects.count
   end
 
-  def test_count_with_counter_sql
-    developer  = DeveloperWithCounterSQL.create(:name => 'tekin')
-    developer.project_ids = [projects(:active_record).id]
-    developer.save
-    developer.reload
-    assert_equal 1, developer.projects.count
-  end
-
   unless current_adapter?(:PostgreSQLAdapter)
     def test_count_with_finder_sql
       assert_equal 3, projects(:active_record).developers_with_finder_sql.count
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 582cde26ed..42e140a831 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -36,19 +36,6 @@ class HasManyAssociationsTestForCountWithFinderSql < ActiveRecord::TestCase
   end
 end
 
-class HasManyAssociationsTestForCountWithCountSql < ActiveRecord::TestCase
-  class Invoice < ActiveRecord::Base
-    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
-      Invoice.create.custom_line_items.count(:conditions => {:amount => 0})
-    end
-  end
-end
-
 class HasManyAssociationsTestForCountWithVariousFinderSqls < ActiveRecord::TestCase
   class Invoice < ActiveRecord::Base
     ActiveSupport::Deprecation.silence do
@@ -381,17 +368,6 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal client, firm.clients_using_sql.find(client.id, client.id.to_s)
   end
 
-  def test_counting_using_sql
-    assert_equal 1, Firm.order("id").first.clients_using_counter_sql.size
-    assert Firm.order("id").first.clients_using_counter_sql.any?
-    assert_equal 0, Firm.order("id").first.clients_using_zero_counter_sql.size
-    assert !Firm.order("id").first.clients_using_zero_counter_sql.any?
-  end
-
-  def test_counting_non_existant_items_using_sql
-    assert_equal 0, Firm.order("id").first.no_clients_using_counter_sql.size
-  end
-
   def test_counting_using_finder_sql
     assert_equal 2, Firm.find(4).clients_using_sql.count
   end
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index b988184f34..12fb183bb3 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -35,13 +35,7 @@ module Namespaced
 end
 
 class Firm < Company
-  ActiveSupport::Deprecation.silence do
-    has_many :clients, -> { order "id" }, :dependent => :destroy, :counter_sql =>
-        "SELECT COUNT(*) FROM companies WHERE firm_id = 1 " +
-        "AND (#{QUOTED_TYPE} = 'Client' OR #{QUOTED_TYPE} = 'SpecialClient' OR #{QUOTED_TYPE} = 'VerySpecialClient' )",
-        :before_remove => :log_before_remove,
-        :after_remove  => :log_after_remove
-  end
+  has_many :clients, -> { order "id" }, :dependent => :destroy, :before_remove => :log_before_remove, :after_remove  => :log_after_remove
   has_many :unsorted_clients, :class_name => "Client"
   has_many :unsorted_clients_with_symbol, :class_name => :Client
   has_many :clients_sorted_desc, -> { order "id DESC" }, :class_name => "Client"
@@ -56,15 +50,6 @@ class Firm < Company
   has_many :clients_like_ms_with_hash_conditions, -> { where(:name => 'Microsoft').order("id") }, :class_name => "Client"
   ActiveSupport::Deprecation.silence do
     has_many :clients_using_sql, :class_name => "Client", :finder_sql => proc { "SELECT * FROM companies WHERE client_of = #{id}" }
-    has_many :clients_using_counter_sql, :class_name => "Client",
-             :finder_sql  => proc { "SELECT * FROM companies WHERE client_of = #{id} " },
-             :counter_sql => proc { "SELECT COUNT(*) FROM companies WHERE client_of = #{id}" }
-    has_many :clients_using_zero_counter_sql, :class_name => "Client",
-             :finder_sql  => proc { "SELECT * FROM companies WHERE client_of = #{id}" },
-             :counter_sql => proc { "SELECT 0 FROM companies WHERE client_of = #{id}" }
-    has_many :no_clients_using_counter_sql, :class_name => "Client",
-             :finder_sql  => 'SELECT * FROM companies WHERE client_of = 1000',
-             :counter_sql => 'SELECT COUNT(*) FROM companies WHERE client_of = 1000'
     has_many :clients_using_finder_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE 1=1'
   end
   has_many :plain_clients, :class_name => 'Client'