Remove deprecated find_first and find_all.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6998 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

4 files changed, 34 insertions, 164 deletions

diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb
index 4045fd8a58..f009c4348e 100755
--- a/activerecord/test/associations_test.rb
+++ b/activerecord/test/associations_test.rb
@@ -534,44 +534,30 @@ class HasManyAssociationsTest < Test::Unit::TestCase
   end
 
   def test_find_all
-    assert_deprecated 'find_all' do
-      firm = Firm.find_first
-      assert_equal firm.clients, firm.clients.find_all
-      assert_equal 2, firm.clients.find(:all, :conditions => "#{QUOTED_TYPE} = 'Client'").length
-      assert_equal 1, firm.clients.find(:all, :conditions => "name = 'Summit'").length
-    end
+    firm = Firm.find(:first)
+    assert_equal 2, firm.clients.find(:all, :conditions => "#{QUOTED_TYPE} = 'Client'").length
+    assert_equal 1, firm.clients.find(:all, :conditions => "name = 'Summit'").length
   end
 
   def test_find_all_sanitized
-    assert_deprecated 'find_all' do
-      firm = Firm.find_first
-      assert_equal firm.clients.find_all("name = 'Summit'"), firm.clients.find_all(["name = '%s'", "Summit"])
-      summit = firm.clients.find(:all, :conditions => "name = 'Summit'")
-      assert_equal summit, firm.clients.find(:all, :conditions => ["name = ?", "Summit"])
-      assert_equal summit, firm.clients.find(:all, :conditions => ["name = :name", { :name => "Summit" }])
-    end
+    firm = Firm.find(:first)
+    summit = firm.clients.find(:all, :conditions => "name = 'Summit'")
+    assert_equal summit, firm.clients.find(:all, :conditions => ["name = ?", "Summit"])
+    assert_equal summit, firm.clients.find(:all, :conditions => ["name = :name", { :name => "Summit" }])
   end
 
   def test_find_first
-    assert_deprecated 'find_first' do
-      firm = Firm.find_first
-      client2 = Client.find(2)
-      assert_equal firm.clients.first, firm.clients.find_first
-      assert_equal client2, firm.clients.find_first("#{QUOTED_TYPE} = 'Client'")
-      assert_equal client2, firm.clients.find(:first, :conditions => "#{QUOTED_TYPE} = 'Client'")
-    end
+    firm = Firm.find(:first)
+    client2 = Client.find(2)
+    assert_equal firm.clients.first, firm.clients.find(:first)
+    assert_equal client2, firm.clients.find(:first, :conditions => "#{QUOTED_TYPE} = 'Client'")
   end
 
   def test_find_first_sanitized
-    assert_deprecated 'find_first' do
-      firm = Firm.find_first
-      client2 = Client.find(2)
-      assert_deprecated(/find_first/) do
-        assert_equal client2, firm.clients.find_first(["#{QUOTED_TYPE} = ?", "Client"])
-      end
-      assert_equal client2, firm.clients.find(:first, :conditions => ["#{QUOTED_TYPE} = ?", 'Client'])
-      assert_equal client2, firm.clients.find(:first, :conditions => ["#{QUOTED_TYPE} = :type", { :type => 'Client' }])
-    end
+    firm = Firm.find(:first)
+    client2 = Client.find(2)
+    assert_equal client2, firm.clients.find(:first, :conditions => ["#{QUOTED_TYPE} = ?", 'Client'])
+    assert_equal client2, firm.clients.find(:first, :conditions => ["#{QUOTED_TYPE} = :type", { :type => 'Client' }])
   end
 
   def test_find_in_collection
@@ -1647,7 +1633,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
     assert david.projects(true).empty?
   end
 
-  def test_rich_association
+  def test_deprecated_push_with_attributes_was_removed
     jamis = developers(:jamis)
     assert_raise(NoMethodError) do
       jamis.projects.push_with_attributes(projects(:action_controller), :joined_on => Date.today)
diff --git a/activerecord/test/deprecated_associations_test.rb b/activerecord/test/deprecated_associations_test.rb
index d9b1cc944f..5887a7b53d 100755
--- a/activerecord/test/deprecated_associations_test.rb
+++ b/activerecord/test/deprecated_associations_test.rb
@@ -17,8 +17,6 @@ raise "ActiveRecord should have barked on bad collection keys" unless bad_collec
 
 class DeprecatedAssociationWarningsTest < Test::Unit::TestCase
   def test_deprecation_warnings
-    assert_deprecated('find_first') { Firm.find_first }
-    assert_deprecated('find_all') { Firm.find_all }
     assert_deprecated('has_account?') { Firm.find(:first).has_account? }
     assert_deprecated('has_clients?') { Firm.find(:first).has_clients? }
   end
@@ -239,7 +237,7 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
   def test_has_and_belongs_to_many_zero
     david = Developer.find(1)
     assert_deprecated do
-      david.remove_projects Project.find_all
+      david.remove_projects Project.find(:all)
       assert_equal 0, david.projects_count
       assert !david.has_projects?
     end
@@ -358,9 +356,8 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
   end
 
   def test_has_many_find_all
-    assert_deprecated 'find_all_in_clients' do
-      assert_equal 2, @firm.find_all_in_clients("#{QUOTED_TYPE} = 'Client'").length
-      assert_equal 1, @firm.find_all_in_clients("name = 'Summit'").length
+    assert_raise(NoMethodError) do
+      @firm.find_all_in_clients("#{QUOTED_TYPE} = 'Client'")
     end
   end
 
diff --git a/activerecord/test/deprecated_finder_test.rb b/activerecord/test/deprecated_finder_test.rb
index 796e46f8c2..097c9131dc 100755
--- a/activerecord/test/deprecated_finder_test.rb
+++ b/activerecord/test/deprecated_finder_test.rb
@@ -1,90 +1,19 @@
 require 'abstract_unit'
-require 'fixtures/company'
-require 'fixtures/topic'
-require 'fixtures/reply'
 require 'fixtures/entrant'
-require 'fixtures/developer'
 
 class DeprecatedFinderTest < Test::Unit::TestCase
-  fixtures :companies, :topics, :entrants, :developers
+  fixtures :entrants
 
-  def test_find_all_with_limit
-    entrants = assert_deprecated { Entrant.find_all nil, "id ASC", 2 }
-    assert_equal 2, entrants.size
-    assert_equal entrants(:first), entrants.first
+  def test_deprecated_find_all_was_removed
+    assert_raise(NoMethodError) { Entrant.find_all }
   end
 
-  def test_find_all_with_prepared_limit_and_offset
-    entrants = assert_deprecated { Entrant.find_all nil, "id ASC", [2, 1] }
-    assert_equal 2, entrants.size
-    assert_equal entrants(:second), entrants.first
+  def test_deprecated_find_first_was_removed
+    assert_raise(NoMethodError) { Entrant.find_first }
   end
 
-  def test_find_first
-    first = assert_deprecated { Topic.find_first "title = 'The First Topic'" }
-    assert_equal topics(:first), first
-  end
-
-  def test_find_first_failing
-    first = assert_deprecated { Topic.find_first "title = 'The First Topic!'" }
-    assert_nil first
-  end
-
-  def test_deprecated_find_on_conditions
-    assert_deprecated 'find_on_conditions' do
-      assert Topic.find_on_conditions(1, ["approved = ?", false])
-      assert_raises(ActiveRecord::RecordNotFound) { Topic.find_on_conditions(1, ["approved = ?", true]) }
-    end
-  end
-
-  def test_condition_interpolation
-    assert_deprecated do
-      assert_kind_of Firm, Company.find_first(["name = '%s'", "37signals"])
-      assert_nil Company.find_first(["name = '%s'", "37signals!"])
-      assert_nil Company.find_first(["name = '%s'", "37signals!' OR 1=1"])
-      assert_kind_of Time, Topic.find_first(["id = %d", 1]).written_on
-    end
-  end
-
-  def test_bind_variables
-    assert_deprecated do
-      assert_kind_of Firm, Company.find_first(["name = ?", "37signals"])
-      assert_nil Company.find_first(["name = ?", "37signals!"])
-      assert_nil Company.find_first(["name = ?", "37signals!' OR 1=1"])
-      assert_kind_of Time, Topic.find_first(["id = ?", 1]).written_on
-      assert_raises(ActiveRecord::PreparedStatementInvalid) {
-        Company.find_first(["id=? AND name = ?", 2])
-      }
-      assert_raises(ActiveRecord::PreparedStatementInvalid) {
-             Company.find_first(["id=?", 2, 3, 4])
-      }
-    end
-  end
-  
-  def test_bind_variables_with_quotes
-    Company.create("name" => "37signals' go'es agains")
-    assert_deprecated do
-      assert_not_nil Company.find_first(["name = ?", "37signals' go'es agains"])
-    end
-  end
-
-  def test_named_bind_variables_with_quotes
-    Company.create("name" => "37signals' go'es agains")
-    assert_deprecated do
-      assert_not_nil Company.find_first(["name = :name", {:name => "37signals' go'es agains"}])
-    end
-  end
-
-  def test_named_bind_variables
-    assert_equal '1', bind(':a', :a => 1) # ' ruby-mode
-    assert_equal '1 1', bind(':a :a', :a => 1)  # ' ruby-mode
-
-    assert_deprecated do
-      assert_kind_of Firm, Company.find_first(["name = :name", { :name => "37signals" }])
-      assert_nil Company.find_first(["name = :name", { :name => "37signals!" }])
-      assert_nil Company.find_first(["name = :name", { :name => "37signals!' OR 1=1" }])
-      assert_kind_of Time, Topic.find_first(["id = :id", { :id => 1 }]).written_on
-    end
+  def test_deprecated_find_on_conditions_was_removed
+    assert_raise(NoMethodError) { Entrant.find_on_conditions }
   end
 
   def test_count
@@ -98,54 +27,4 @@ class DeprecatedFinderTest < Test::Unit::TestCase
     assert_equal(1, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 2]))
     assert_equal(2, Entrant.count_by_sql(["SELECT COUNT(*) FROM entrants WHERE id > ?", 1]))
   end
-
-  def test_find_all_with_limit
-    assert_deprecated do
-      first_five_developers = Developer.find_all nil, 'id ASC', 5
-      assert_equal 5, first_five_developers.length
-      assert_equal 'David', first_five_developers.first.name
-      assert_equal 'fixture_5', first_five_developers.last.name
-
-      no_developers = Developer.find_all nil, 'id ASC', 0
-      assert_equal 0, no_developers.length
-
-      assert_equal first_five_developers, Developer.find_all(nil, 'id ASC', [5])
-      assert_equal no_developers, Developer.find_all(nil, 'id ASC', [0])
-    end
-  end
-
-  def test_find_all_with_limit_and_offset
-    assert_deprecated do
-      first_three_developers = Developer.find_all nil, 'id ASC', [3, 0]
-      second_three_developers = Developer.find_all nil, 'id ASC', [3, 3]
-      last_two_developers = Developer.find_all nil, 'id ASC', [2, 8]
-
-      assert_equal 3, first_three_developers.length
-      assert_equal 3, second_three_developers.length
-      assert_equal 2, last_two_developers.length
-
-      assert_equal 'David', first_three_developers.first.name
-      assert_equal 'fixture_4', second_three_developers.first.name
-      assert_equal 'fixture_9', last_two_developers.first.name
-    end
-  end
-
-  def test_find_all_by_one_attribute_with_options
-    assert_not_deprecated do
-      topics = Topic.find_all_by_content("Have a nice day", "id DESC")
-      assert topics(:first), topics.last
-
-      topics = Topic.find_all_by_content("Have a nice day", "id DESC")
-      assert topics(:first), topics.first
-    end
-  end
-
-  protected
-    def bind(statement, *vars)
-      if vars.first.is_a?(Hash)
-        ActiveRecord::Base.send(:replace_named_bind_variables, statement, vars.first)
-      else
-        ActiveRecord::Base.send(:replace_bind_variables, statement, vars)
-      end
-    end
 end
diff --git a/activerecord/test/finder_test.rb b/activerecord/test/finder_test.rb
index 38838cab83..f4ab465bf4 100644
--- a/activerecord/test/finder_test.rb
+++ b/activerecord/test/finder_test.rb
@@ -176,6 +176,14 @@ class FinderTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
   end
 
+
+  def test_condition_interpolation
+    assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
+    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])
+    assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!' OR 1=1"])
+    assert_kind_of Time, Topic.find(:first, :conditions => ["id = %d", 1]).written_on
+  end
+
   def test_condition_array_interpolation
     assert_kind_of Firm, Company.find(:first, :conditions => ["name = '%s'", "37signals"])
     assert_nil Company.find(:first, :conditions => ["name = '%s'", "37signals!"])