ibm_db 3.0.5-x86-mingw32 → 5.0.5-x86-mingw32

data/test/cases/errors_test.rb

@@ -0,0 +1,16 @@
+require_relative "../cases/helper"
+
+class ErrorsTest < ActiveRecord::TestCase
+  def test_can_be_instantiated_with_no_args
+    base = ActiveRecord::ActiveRecordError
+    error_klasses = ObjectSpace.each_object(Class).select { |klass| klass < base }
+
+    error_klasses.each do |error_klass|
+      begin
+        error_klass.new.inspect
+      rescue ArgumentError
+        raise "Instance of #{error_klass} can't be initialized with no arguments"
+      end
+    end
+  end
+end

data/test/cases/explain_test.rb

@@ -28,7 +28,7 @@ if ActiveRecord::Base.connection.supports_explain?
       assert_match "SELECT", sql
       if binds.any?
         assert_equal 1, binds.length
-        assert_equal "honda", binds.flatten.last
+        assert_equal "honda", binds.last.value
       else
         assert_match 'honda', sql
       end
@@ -39,38 +39,49 @@ if ActiveRecord::Base.connection.supports_explain?
       binds   = [[], []]
       queries = sqls.zip(binds)
 
-      connection.stubs(:explain).returns('query plan foo', 'query plan bar')
-      expected = sqls.map {|sql| "EXPLAIN for: #{sql}\nquery plan #{sql}"}.join("\n")
-      assert_equal expected, base.exec_explain(queries)
+      stub_explain_for_query_plans do
+        expected = sqls.map {|sql| "EXPLAIN for: #{sql}\nquery plan #{sql}"}.join("\n")
+        assert_equal expected, base.exec_explain(queries)
+      end
     end
 
     def test_exec_explain_with_binds
-      cols = [Object.new, Object.new]
-      cols[0].expects(:name).returns('wadus')
-      cols[1].expects(:name).returns('chaflan')
-
       sqls    = %w(foo bar)
-      binds   = [[[cols[0], 1]], [[cols[1], 2]]]
+      binds   = [[bind_param("wadus", 1)], [bind_param("chaflan", 2)]]
       queries = sqls.zip(binds)
 
-      connection.stubs(:explain).returns("query plan foo\n", "query plan bar\n")
-      expected = <<-SQL.strip_heredoc
-        EXPLAIN for: #{sqls[0]} [["wadus", 1]]
-        query plan foo
+      stub_explain_for_query_plans(["query plan foo\n", "query plan bar\n"]) do
+        expected = <<-SQL.strip_heredoc
+          EXPLAIN for: #{sqls[0]} [["wadus", 1]]
+          query plan foo
 
-        EXPLAIN for: #{sqls[1]} [["chaflan", 2]]
-        query plan bar
-      SQL
-      assert_equal expected, base.exec_explain(queries)
+          EXPLAIN for: #{sqls[1]} [["chaflan", 2]]
+          query plan bar
+        SQL
+        assert_equal expected, base.exec_explain(queries)
+      end
     end
 
     def test_unsupported_connection_adapter
-      connection.stubs(:supports_explain?).returns(false)
+      connection.stub(:supports_explain?, false) do
+        assert_not_called(base.logger, :warn) do
+          Car.where(:name => 'honda').to_a
+        end
+      end
+    end
 
-      base.logger.expects(:warn).never
+    private
 
-      Car.where(:name => 'honda').to_a
-    end
+      def stub_explain_for_query_plans(query_plans = ['query plan foo', 'query plan bar'])
+        explain_called = 0
+
+        connection.stub(:explain, proc{ explain_called += 1; query_plans[explain_called - 1] }) do
+          yield
+        end
+      end
 
+      def bind_param(name, value)
+        ActiveRecord::Relation::QueryAttribute.new(name, value, ActiveRecord::Type::Value.new)
+      end
   end
 end

data/test/cases/finder_test.rb

@@ -43,11 +43,82 @@ class FinderTest < ActiveRecord::TestCase
     end
     assert_equal "should happen", exception.message
 
-    assert_nothing_raised(RuntimeError) do
+    assert_nothing_raised do
       Topic.all.find(-> { raise "should not happen" }) { |e| e.title == topics(:first).title }
     end
   end
 
+  def test_find_with_ids_returning_ordered
+    puts "finder_test.test_find_with_ids_returning_ordered"
+    records = Topic.find([4,2,5])
+    assert_equal 'The Fourth Topic of the day', records[0].title
+    assert_equal 'The Second Topic of the day', records[1].title
+    assert_equal 'The Fifth Topic of the day', records[2].title
+
+    records = Topic.find(4,2,5)
+    assert_equal 'The Fourth Topic of the day', records[0].title
+    assert_equal 'The Second Topic of the day', records[1].title
+    assert_equal 'The Fifth Topic of the day', records[2].title
+
+    records = Topic.find(['4','2','5'])
+    assert_equal 'The Fourth Topic of the day', records[0].title
+    assert_equal 'The Second Topic of the day', records[1].title
+    assert_equal 'The Fifth Topic of the day', records[2].title
+
+    records = Topic.find('4','2','5')
+    assert_equal 'The Fourth Topic of the day', records[0].title
+    assert_equal 'The Second Topic of the day', records[1].title
+    assert_equal 'The Fifth Topic of the day', records[2].title
+  end
+
+  def test_find_with_ids_and_order_clause
+    # The order clause takes precedence over the informed ids
+    records = Topic.order(:author_name).find([5,3,1])
+    assert_equal 'The Third Topic of the day', records[0].title
+    assert_equal 'The First Topic',            records[1].title
+    assert_equal 'The Fifth Topic of the day', records[2].title
+
+    records = Topic.order(:id).find([5,3,1])
+    assert_equal 'The First Topic',            records[0].title
+    assert_equal 'The Third Topic of the day', records[1].title
+    assert_equal 'The Fifth Topic of the day', records[2].title
+  end
+
+  def test_find_with_ids_with_limit_and_order_clause
+    puts "finder_test.test_find_with_ids_with_limit_and_order_clause"
+    # The order clause takes precedence over the informed ids
+    records = Topic.limit(2).order(:id).find([5,3,1])
+    assert_equal 2, records.size
+    assert_equal 'The First Topic',            records[0].title
+    assert_equal 'The Third Topic of the day', records[1].title
+  end
+
+  def test_find_with_ids_and_limit
+    records = Topic.limit(3).find([3,2,5,1,4])
+    assert_equal 3, records.size
+    assert_equal 'The Third Topic of the day',  records[0].title
+    assert_equal 'The Second Topic of the day', records[1].title
+    assert_equal 'The Fifth Topic of the day',  records[2].title
+  end
+
+  def test_find_with_ids_where_and_limit
+    # Please note that Topic 1 is the only not approved so
+    # if it were among the first 3 it would raise an ActiveRecord::RecordNotFound
+    records = Topic.where(approved: true).limit(3).find([3,2,5,1,4])
+    assert_equal 3, records.size
+    assert_equal 'The Third Topic of the day',  records[0].title
+    assert_equal 'The Second Topic of the day', records[1].title
+    assert_equal 'The Fifth Topic of the day',  records[2].title
+  end
+
+  def test_find_with_ids_and_offset
+    records = Topic.offset(2).find([3,2,5,1,4])
+    assert_equal 3, records.size
+    assert_equal 'The Fifth Topic of the day',  records[0].title
+    assert_equal 'The First Topic',             records[1].title
+    assert_equal 'The Fourth Topic of the day', records[2].title
+  end
+
   def test_find_passing_active_record_object_is_deprecated
     assert_deprecated do
       Topic.find(Topic.last)
@@ -86,6 +157,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_exists_with_polymorphic_relation
+    puts "finder_test.test_exists_with_polymorphic_relation"
     post = Post.create!(title: 'Post', body: 'default', taggings: [Tagging.new(comment: 'tagging comment')])
     relation = Post.tagged_with_comment('tagging comment')
 
@@ -105,13 +177,15 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_exists_fails_when_parameter_has_invalid_type
-    assert_raises(RangeError) do
+    puts "finder_test.test_exists_fails_when_parameter_has_invalid_type"
+    assert_raises(ActiveModel::RangeError) do
       assert_equal false, Topic.exists?(("9"*53).to_i) # number that's bigger than int
     end
     assert_equal false, Topic.exists?("foo")
   end
 
   def test_exists_does_not_select_columns_without_alias
+    puts "finder_test.test_exists_does_not_select_columns_without_alias"
     assert_sql(/SELECT\W+1 AS one FROM ["`]topics["`]/i) do
       Topic.exists?
     end
@@ -141,17 +215,20 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_exists_with_includes_limit_and_empty_result
+    puts "finder_test.test_exists_with_includes_limit_and_empty_result"
     assert_equal false, Topic.includes(:replies).limit(0).exists?
     assert_equal false, Topic.includes(:replies).limit(1).where('0 = 1').exists?
   end
 
   def test_exists_with_distinct_association_includes_and_limit
+    puts "finder_test.test_exists_with_distinct_association_includes_and_limit"
     author = Author.first
     assert_equal false, author.unique_categorized_posts.includes(:special_comments).limit(0).exists?
     assert_equal true, author.unique_categorized_posts.includes(:special_comments).limit(1).exists?
   end
 
   def test_exists_with_distinct_association_includes_limit_and_order
+    puts "finder_test.test_exists_with_distinct_association_includes_limit_and_order"
     author = Author.first
     assert_equal false, author.unique_categorized_posts.includes(:special_comments).order('comments.tags_count DESC').limit(0).exists?
     assert_equal true, author.unique_categorized_posts.includes(:special_comments).order('comments.tags_count DESC').limit(1).exists?
@@ -178,8 +255,9 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_exists_does_not_instantiate_records
-    Developer.expects(:instantiate).never
-    Developer.exists?
+    assert_not_called(Developer, :instantiate) do
+      Developer.exists?
+    end
   end
 
   def test_find_by_array_of_one_id
@@ -194,7 +272,9 @@ class FinderTest < ActiveRecord::TestCase
 
   def test_find_by_ids_with_limit_and_offset
     assert_equal 2, Entrant.limit(2).find([1,3,2]).size
-    assert_equal 1, Entrant.limit(3).offset(2).find([1,3,2]).size
+    entrants = Entrant.limit(3).offset(2).find([1,3,2])
+    assert_equal 1, entrants.size
+    assert_equal 'Ruby Guru', entrants.first.name
 
     # Also test an edge case: If you have 11 results, and you set a
     #   limit of 3 and offset of 9, then you should find that there
@@ -202,28 +282,32 @@ class FinderTest < ActiveRecord::TestCase
     devs = Developer.all
     last_devs = Developer.limit(3).offset(9).find devs.map(&:id)
     assert_equal 2, last_devs.size
+    assert_equal 'fixture_10', last_devs[0].name
+    assert_equal 'Jamis', last_devs[1].name
   end
 
-  def test_find_with_large_number
-    assert_raises(ActiveRecord::RecordNotFound) { Topic.find('9999999999999999999999999999999') }
-  end
+  unless current_adapter?(:IBM_DBAdapter)
+	  def test_find_with_large_number
+		assert_raises(ActiveRecord::RecordNotFound) { Topic.find('9999999999999999999999999999999') }
+	  end
 
-  def test_find_by_with_large_number
-    assert_nil Topic.find_by(id: '9999999999999999999999999999999')
-  end
+  	  def test_find_by_with_large_number
+		assert_nil Topic.find_by(id: '9999999999999999999999999999999')
+	  end
 
-  def test_find_by_id_with_large_number
-    assert_nil Topic.find_by_id('9999999999999999999999999999999')
-  end
+	  def test_find_by_id_with_large_number
+		assert_nil Topic.find_by_id('9999999999999999999999999999999')
+	  end
 
-  def test_find_on_relation_with_large_number
-    assert_nil Topic.where('1=1').find_by(id: 9999999999999999999999999999999)
-  end
+	  def test_find_on_relation_with_large_number
+		assert_nil Topic.where('1=1').find_by(id: 9999999999999999999999999999999)
+	  end
 
-  def test_find_by_bang_on_relation_with_large_number
-    assert_raises(ActiveRecord::RecordNotFound) do
-      Topic.where('1=1').find_by!(id: 9999999999999999999999999999999)
-    end
+	  def test_find_by_bang_on_relation_with_large_number
+		assert_raises(ActiveRecord::RecordNotFound) do
+		  Topic.where('1=1').find_by!(id: 9999999999999999999999999999999)
+		end
+	  end
   end
 
   def test_find_an_empty_array
@@ -264,6 +348,17 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [Account], accounts.collect(&:class).uniq
   end
 
+  def test_find_by_association_subquery
+    author = authors(:david)
+    assert_equal author.post, Post.find_by(author: Author.where(id: author))
+    assert_equal author.post, Post.find_by(author_id: Author.where(id: author))
+  end
+
+  def test_find_by_and_where_consistency_with_active_record_instance
+    author = authors(:david)
+    assert_equal Post.where(author_id: author).take, Post.find_by(author_id: author)
+  end
+
   def test_take
     assert_equal topics(:first), Topic.take
   end
@@ -319,14 +414,17 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_second
+    puts "finder_test.test_second"
     assert_equal topics(:second).title, Topic.second.title
   end
 
   def test_second_with_offset
+    puts "finder_test.test_second_with_offset"
     assert_equal topics(:fifth), Topic.offset(3).second
   end
 
   def test_second_have_primary_key_order_by_default
+    puts "finder_test.test_second_have_primary_key_order_by_default"
     expected = topics(:second)
     expected.touch # PostgreSQL changes the default order if no order clause is used
     assert_equal expected, Topic.second
@@ -341,14 +439,17 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_third
+    puts "finder_test.test_third"
     assert_equal topics(:third).title, Topic.third.title
   end
 
   def test_third_with_offset
+    puts "finder_test.test_third_with_offset"
     assert_equal topics(:fifth), Topic.offset(2).third
   end
 
   def test_third_have_primary_key_order_by_default
+    puts "finder_test.test_third_have_primary_key_order_by_default"
     expected = topics(:third)
     expected.touch # PostgreSQL changes the default order if no order clause is used
     assert_equal expected, Topic.third
@@ -363,14 +464,17 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_fourth
+    puts "finder_test.test_fourth"
     assert_equal topics(:fourth).title, Topic.fourth.title
   end
 
   def test_fourth_with_offset
+    puts "finder_test.test_fourth_with_offset"
     assert_equal topics(:fifth), Topic.offset(1).fourth
   end
 
   def test_fourth_have_primary_key_order_by_default
+    puts "finder_test.test_fourth_have_primary_key_order_by_default"
     expected = topics(:fourth)
     expected.touch # PostgreSQL changes the default order if no order clause is used
     assert_equal expected, Topic.fourth
@@ -389,10 +493,12 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_fifth_with_offset
+    puts "finder_test.test_fifth_with_offset"
     assert_equal topics(:fifth), Topic.offset(0).fifth
   end
 
   def test_fifth_have_primary_key_order_by_default
+    puts "finder_test.test_fifth_have_primary_key_order_by_default"
     expected = topics(:fifth)
     expected.touch # PostgreSQL changes the default order if no order clause is used
     assert_equal expected, Topic.fifth
@@ -406,6 +512,67 @@ class FinderTest < ActiveRecord::TestCase
     end
   end
 
+  def test_second_to_last
+    puts "finder_test.test_second_to_last"
+    assert_equal topics(:fourth).title, Topic.second_to_last.title
+
+    # test with offset
+    assert_equal topics(:fourth), Topic.offset(1).second_to_last
+    assert_equal topics(:fourth), Topic.offset(2).second_to_last
+    assert_equal topics(:fourth), Topic.offset(3).second_to_last
+    assert_equal nil, Topic.offset(4).second_to_last
+    assert_equal nil, Topic.offset(5).second_to_last
+
+    #test with limit
+    # assert_equal nil, Topic.limit(1).second # TODO: currently failing
+    assert_equal nil, Topic.limit(1).second_to_last
+  end
+
+  def test_second_to_last_have_primary_key_order_by_default
+    expected = topics(:fourth)
+    expected.touch # PostgreSQL changes the default order if no order clause is used
+    assert_equal expected, Topic.second_to_last
+  end
+
+  def test_model_class_responds_to_second_to_last_bang
+    assert Topic.second_to_last!
+    Topic.delete_all
+    assert_raises_with_message ActiveRecord::RecordNotFound, "Couldn't find Topic" do
+      Topic.second_to_last!
+    end
+  end
+
+  def test_third_to_last
+    assert_equal topics(:third).title, Topic.third_to_last.title
+
+    # test with offset
+    assert_equal topics(:third), Topic.offset(1).third_to_last
+    assert_equal topics(:third), Topic.offset(2).third_to_last
+    assert_equal nil, Topic.offset(3).third_to_last
+    assert_equal nil, Topic.offset(4).third_to_last
+    assert_equal nil, Topic.offset(5).third_to_last
+
+    # test with limit
+    # assert_equal nil, Topic.limit(1).third # TODO: currently failing
+    assert_equal nil, Topic.limit(1).third_to_last
+    # assert_equal nil, Topic.limit(2).third # TODO: currently failing
+    assert_equal nil, Topic.limit(2).third_to_last
+  end
+
+  def test_third_to_last_have_primary_key_order_by_default
+    expected = topics(:third)
+    expected.touch # PostgreSQL changes the default order if no order clause is used
+    assert_equal expected, Topic.third_to_last
+  end
+
+  def test_model_class_responds_to_third_to_last_bang
+    assert Topic.third_to_last!
+    Topic.delete_all
+    assert_raises_with_message ActiveRecord::RecordNotFound, "Couldn't find Topic" do
+      Topic.third_to_last!
+    end
+  end
+
   def test_last_bang_present
     assert_nothing_raised do
       assert_equal topics(:second), Topic.where("title = 'The Second Topic of the day'").last!
@@ -427,25 +594,55 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_take_and_first_and_last_with_integer_should_use_sql_limit
-    assert_sql(/LIMIT 3|ROWNUM <= 3/) { Topic.take(3).entries }
-    assert_sql(/LIMIT 2|ROWNUM <= 2/) { Topic.first(2).entries }
-    assert_sql(/LIMIT 5|ROWNUM <= 5/) { Topic.last(5).entries }
+    puts "finder_test.test_take_and_first_and_last_with_integer_should_use_sql_limit"
+    assert_sql(/LIMIT|ROWNUM <=|FETCH FIRST/) { Topic.take(3).entries }
+    assert_sql(/LIMIT|ROWNUM <=|FETCH FIRST/) { Topic.first(2).entries }
+    assert_sql(/LIMIT|ROWNUM <=|FETCH FIRST/) { Topic.last(5).entries }
   end
 
   def test_last_with_integer_and_order_should_keep_the_order
+    puts "finder_test.test_last_with_integer_and_order_should_keep_the_order"
     assert_equal Topic.order("title").to_a.last(2), Topic.order("title").last(2)
   end
 
-  def test_last_with_integer_and_order_should_not_use_sql_limit
-    query = assert_sql { Topic.order("title").last(5).entries }
-    assert_equal 1, query.length
-    assert_no_match(/LIMIT/, query.first)
+  def test_last_with_integer_and_order_should_use_sql_limit
+    relation = Topic.order("title")
+    assert_queries(1) { relation.last(5) }
+    assert !relation.loaded?
+  end
+
+  def test_last_with_integer_and_reorder_should_use_sql_limit
+    relation = Topic.reorder("title")
+    assert_queries(1) { relation.last(5) }
+    assert !relation.loaded?
   end
 
-  def test_last_with_integer_and_reorder_should_not_use_sql_limit
-    query = assert_sql { Topic.reorder("title").last(5).entries }
-    assert_equal 1, query.length
-    assert_no_match(/LIMIT/, query.first)
+  def test_last_on_loaded_relation_should_not_use_sql
+    relation  = Topic.limit(10).load
+    assert_no_queries do
+      relation.last
+      relation.last(2)
+    end
+  end
+
+  def test_last_with_irreversible_order
+    assert_deprecated do
+      Topic.order("coalesce(author_name, title)").last
+    end
+  end
+
+  def test_last_on_relation_with_limit_and_offset
+    post = posts('sti_comments')
+
+    comments = post.comments.order(id: :asc)
+    assert_equal comments.limit(2).to_a.last, comments.limit(2).last
+    assert_equal comments.limit(2).to_a.last(2), comments.limit(2).last(2)
+    assert_equal comments.limit(2).to_a.last(3), comments.limit(2).last(3)
+
+    comments = comments.offset(1)
+    assert_equal comments.limit(2).to_a.last, comments.limit(2).last
+    assert_equal comments.limit(2).to_a.last(2), comments.limit(2).last(2)
+    assert_equal comments.limit(2).to_a.last(3), comments.limit(2).last(3)
   end
 
   def test_take_and_first_and_last_with_integer_should_return_an_array
@@ -484,16 +681,27 @@ class FinderTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::RecordNotFound) { Topic.where(approved: true).find(1) }
   end
 
-  def test_find_on_hash_conditions_with_explicit_table_name
+  def test_find_on_hash_conditions_with_qualified_attribute_dot_notation_string
     assert Topic.where('topics.approved' => false).find(1)
     assert_raise(ActiveRecord::RecordNotFound) { Topic.where('topics.approved' => true).find(1) }
   end
 
+  def test_find_on_hash_conditions_with_qualified_attribute_dot_notation_symbol
+    assert Topic.where('topics.approved': false).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.where('topics.approved': true).find(1) }
+  end
+
   def test_find_on_hash_conditions_with_hashed_table_name
     assert Topic.where(topics: { approved: false }).find(1)
     assert_raise(ActiveRecord::RecordNotFound) { Topic.where(topics: { approved: true }).find(1) }
   end
 
+  def test_find_on_combined_explicit_and_hashed_table_names
+    assert Topic.where('topics.approved' => false, topics: { author_name: "David" }).find(1)
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.where('topics.approved' => true, topics: { author_name: "David" }).find(1) }
+    assert_raise(ActiveRecord::RecordNotFound) { Topic.where('topics.approved' => false, topics: { author_name: "Melanie" }).find(1) }
+  end
+
   def test_find_with_hash_conditions_on_joined_table
     firms = Firm.joins(:account).where(:accounts => { :credit_limit => 50 })
     assert_equal 1, firms.size
@@ -542,30 +750,6 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [1,2,6,7,8], Comment.where(id: [1..2, 6..8]).to_a.map(&:id).sort
   end
 
-  def test_find_on_hash_conditions_with_nested_array_of_integers_and_ranges
-    assert_deprecated do
-      assert_equal [1,2,3,5,6,7,8,9], Comment.where(id: [[1..2], 3, [5], 6..8, 9]).to_a.map(&:id).sort
-    end
-  end
-
-  def test_find_on_hash_conditions_with_array_of_integers_and_arrays
-    assert_deprecated do
-      assert_equal [1,2,3,5,6,7,8,9], Comment.where(id: [[1, 2], 3, 5, [6, [7], 8], 9]).to_a.map(&:id).sort
-    end
-  end
-
-  def test_find_on_hash_conditions_with_nested_array_of_integers_and_ranges_and_nils
-    assert_deprecated do
-      assert_equal [1,3,4,5], Topic.where(parent_id: [[2..6], nil]).to_a.map(&:id).sort
-    end
-  end
-
-  def test_find_on_hash_conditions_with_nested_array_of_integers_and_ranges_and_more_nils
-    assert_deprecated do
-      assert_equal [], Topic.where(parent_id: [[7..10, nil, [nil]], [nil]]).to_a.map(&:id).sort
-    end
-  end
-
   def test_find_on_multiple_hash_conditions
     assert Topic.where(author_name: "David", title: "The First Topic", replies_count: 1, approved: false).find(1)
     assert_raise(ActiveRecord::RecordNotFound) { Topic.where(author_name: "David", title: "The First Topic", replies_count: 1, approved: true).find(1) }
@@ -574,6 +758,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_condition_interpolation
+    puts "finder_test.test_condition_interpolation"
     assert_kind_of Firm, Company.where("name = '%s'", "37signals").first
     assert_nil Company.where(["name = '%s'", "37signals!"]).first
     assert_nil Company.where(["name = '%s'", "37signals!' OR 1=1"]).first
@@ -581,6 +766,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_condition_array_interpolation
+    puts "finder_test.test_condition_array_interpolation"
     assert_kind_of Firm, Company.where(["name = '%s'", "37signals"]).first
     assert_nil Company.where(["name = '%s'", "37signals!"]).first
     assert_nil Company.where(["name = '%s'", "37signals!' OR 1=1"]).first
@@ -600,11 +786,13 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_hash_condition_find_with_escaped_characters
+    puts "finder_test.test_hash_condition_find_with_escaped_characters"
     Company.create("name" => "Ain't noth'n like' \#stuff")
     assert Company.where(name: "Ain't noth'n like' \#stuff").first
   end
 
   def test_hash_condition_find_with_array
+    puts "finder_test.test_hash_condition_find_with_array"
     p1, p2 = Post.limit(2).order('id asc').to_a
     assert_equal [p1, p2], Post.where(id: [p1, p2]).order('id asc').to_a
     assert_equal [p1, p2], Post.where(id: [p1, p2.id]).order('id asc').to_a
@@ -668,6 +856,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_hash_condition_utc_time_interpolation_with_default_timezone_local
+    puts "finder_test.test_hash_condition_utc_time_interpolation_with_default_timezone_local"
     with_env_tz 'America/New_York' do
       with_timezone_config default: :local do
         topic = Topic.first
@@ -677,6 +866,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_condition_local_time_interpolation_with_default_timezone_utc
+    puts "finder_test.test_condition_local_time_interpolation_with_default_timezone_utc"
     with_env_tz 'America/New_York' do
       with_timezone_config default: :utc do
         topic = Topic.first
@@ -686,6 +876,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_hash_condition_local_time_interpolation_with_default_timezone_utc
+    puts "finder_test.test_hash_condition_local_time_interpolation_with_default_timezone_utc"
     with_env_tz 'America/New_York' do
       with_timezone_config default: :utc do
         topic = Topic.first
@@ -708,99 +899,25 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_bind_variables_with_quotes
+    puts "finder_test.test_bind_variables_with_quotes"
     Company.create("name" => "37signals' go'es agains")
     assert Company.where(["name = ?", "37signals' go'es agains"]).first
   end
 
   def test_named_bind_variables_with_quotes
+    puts "finder_test.test_named_bind_variables_with_quotes"
     Company.create("name" => "37signals' go'es agains")
     assert Company.where(["name = :name", {name: "37signals' go'es agains"}]).first
   end
 
-  def test_bind_arity
-    assert_nothing_raised                                 { bind '' }
-    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '', 1 }
-
-    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '?' }
-    assert_nothing_raised                                 { bind '?', 1 }
-    assert_raise(ActiveRecord::PreparedStatementInvalid) { bind '?', 1, 1  }
-  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_nothing_raised { bind("'+00:00'", :foo => "bar") }
-
+    puts "finder_test.test_named_bind_variables"
     assert_kind_of Firm, Company.where(["name = :name", { name: "37signals" }]).first
     assert_nil Company.where(["name = :name", { name: "37signals!" }]).first
     assert_nil Company.where(["name = :name", { name: "37signals!' OR 1=1" }]).first
     assert_kind_of Time, Topic.where(["id = :id", { id: 1 }]).first.written_on
   end
 
-  class SimpleEnumerable
-    include Enumerable
-
-    def initialize(ary)
-      @ary = ary
-    end
-
-    def each(&b)
-      @ary.each(&b)
-    end
-  end
-
-  def test_bind_enumerable
-    quoted_abc = %(#{ActiveRecord::Base.connection.quote('a')},#{ActiveRecord::Base.connection.quote('b')},#{ActiveRecord::Base.connection.quote('c')})
-
-    assert_equal '1,2,3', bind('?', [1, 2, 3])
-    assert_equal quoted_abc, bind('?', %w(a b c))
-
-    assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
-    assert_equal quoted_abc, bind(':a', :a => %w(a b c)) # '
-
-    assert_equal '1,2,3', bind('?', SimpleEnumerable.new([1, 2, 3]))
-    assert_equal quoted_abc, bind('?', SimpleEnumerable.new(%w(a b c)))
-
-    assert_equal '1,2,3', bind(':a', :a => SimpleEnumerable.new([1, 2, 3]))
-    assert_equal quoted_abc, bind(':a', :a => SimpleEnumerable.new(%w(a b c))) # '
-  end
-
-  def test_bind_empty_enumerable
-    quoted_nil = ActiveRecord::Base.connection.quote(nil)
-    assert_equal quoted_nil, bind('?', [])
-    assert_equal " in (#{quoted_nil})", bind(' in (?)', [])
-    assert_equal "foo in (#{quoted_nil})", bind('foo in (?)', [])
-  end
-
-  def test_bind_empty_string
-    quoted_empty = ActiveRecord::Base.connection.quote('')
-    assert_equal quoted_empty, bind('?', '')
-  end
-
-  def test_bind_chars
-    quoted_bambi = ActiveRecord::Base.connection.quote("Bambi")
-    quoted_bambi_and_thumper = ActiveRecord::Base.connection.quote("Bambi\nand\nThumper")
-    assert_equal "name=#{quoted_bambi}", bind('name=?', "Bambi")
-    assert_equal "name=#{quoted_bambi_and_thumper}", bind('name=?', "Bambi\nand\nThumper")
-    assert_equal "name=#{quoted_bambi}", bind('name=?', "Bambi".mb_chars)
-    assert_equal "name=#{quoted_bambi_and_thumper}", bind('name=?', "Bambi\nand\nThumper".mb_chars)
-  end
-
-  def test_bind_record
-    o = Struct.new(:quoted_id).new(1)
-    assert_equal '1', bind('?', o)
-
-    os = [o] * 3
-    assert_equal '1,1,1', bind('?', os)
-  end
-
-  def test_named_bind_with_postgresql_type_casts
-    l = Proc.new { bind(":a::integer '2009-01-01'::date", :a => '10') }
-    assert_nothing_raised(&l)
-    assert_equal "#{ActiveRecord::Base.connection.quote('10')}::integer '2009-01-01'::date", l.call
-  end
-
   def test_string_sanitation
     assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
     assert_equal "'something; select table'", ActiveRecord::Base.sanitize("something; select table")
@@ -825,6 +942,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_by_on_attribute_that_is_a_reserved_word
+    puts "finder_test.test_find_by_on_attribute_that_is_a_reserved_word"
     dog_alias = 'Dog'
     dog = Dog.create(alias: dog_alias)
 
@@ -837,6 +955,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_by_one_attribute_bang_with_blank_defined
+    puts "finder_test.test_find_by_one_attribute_bang_with_blank_defined"
     blank_topic = BlankTopic.create(title: "The Blank One")
     assert_equal blank_topic, BlankTopic.find_by_title!("The Blank One")
   end
@@ -911,6 +1030,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_last_with_offset
+    puts "finder_test.test_find_last_with_offset"
     devs = Developer.order('id')
 
     assert_equal devs[2], Developer.offset(2).first
@@ -939,7 +1059,7 @@ class FinderTest < ActiveRecord::TestCase
       joins('LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id').
       where('project_id=1').to_a
     assert_equal 3, developers_on_project_one.length
-    developer_names = developers_on_project_one.map { |d| d.name }
+    developer_names = developers_on_project_one.map(&:name)
     assert developer_names.include?('David')
     assert developer_names.include?('Jamis')
   end
@@ -965,8 +1085,8 @@ class FinderTest < ActiveRecord::TestCase
     end
   end
 
-  # http://dev.rubyonrails.org/ticket/6778
   def test_find_ignores_previously_inserted_record
+    puts "finder_test.test_find_ignores_previously_inserted_record"
     Post.create!(:title => 'test', :body => 'it out')
     assert_equal [], Post.where(id: nil)
   end
@@ -980,6 +1100,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_by_records
+    puts "finder_test.test_find_by_records"
     p1, p2 = Post.limit(2).order('id asc').to_a
     assert_equal [p1, p2], Post.where(['id in (?)', [p1, p2]]).order('id asc')
     assert_equal [p1, p2], Post.where(['id in (?)', [p1, p2.id]]).order('id asc')
@@ -994,7 +1115,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_select_values
-    assert_equal ["1","2","3","4","5","6","7","8","9", "10", "11"], Company.connection.select_values("SELECT id FROM companies ORDER BY id").map! { |i| i.to_s }
+    assert_equal ["1","2","3","4","5","6","7","8","9", "10", "11"], Company.connection.select_values("SELECT id FROM companies ORDER BY id").map!(&:to_s)
     assert_equal ["37signals","Summit","Microsoft", "Flamboyant Software", "Ex Nihilo", "RailsCore", "Leetsoft", "Jadedpixel", "Odegy", "Ex Nihilo Part Deux", "Apex"], Company.connection.select_values("SELECT name FROM companies ORDER BY id")
   end
 
@@ -1009,6 +1130,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct
+    puts "finder_test.test_find_with_order_on_included_associations_with_construct_finder_sql_for_association_limiting_and_is_distinct"
     assert_equal 2, Post.includes(authors: :author_address).
       where.not(author_addresses: { id: nil }).
       order('author_addresses.id DESC').limit(2).to_a.size
@@ -1023,7 +1145,7 @@ class FinderTest < ActiveRecord::TestCase
       where(client_of: [2, 1, nil],
             name: ['37signals', 'Summit', 'Microsoft']).
       order('client_of DESC').
-      map { |x| x.client_of }
+      map(&:client_of)
 
     assert client_of.include?(nil)
     assert_equal [2, 1].sort, client_of.compact.sort
@@ -1033,12 +1155,13 @@ class FinderTest < ActiveRecord::TestCase
     client_of = Company.
       where(client_of: [nil]).
       order('client_of DESC').
-      map { |x| x.client_of }
+      map(&:client_of)
 
     assert_equal [], client_of.compact
   end
 
   def test_with_limiting_with_custom_select
+    puts "finder_test.test_with_limiting_with_custom_select"
     posts = Post.references(:authors).merge(
       :includes => :author, :select => 'posts.*, authors.id as "author_id"',
       :limit => 3, :order => 'posts.id'
@@ -1047,6 +1170,16 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [0, 1, 1], posts.map(&:author_id).sort
   end
 
+  def test_find_one_message_on_primary_key
+    e = assert_raises(ActiveRecord::RecordNotFound) do
+      Car.find(0)
+    end
+    assert_equal 0, e.id
+    assert_equal "id", e.primary_key
+    assert_equal "Car", e.model
+    assert_equal "Couldn't find Car with 'id'=0", e.message
+  end
+
   def test_find_one_message_with_custom_primary_key
     table_with_custom_primary_key do |model|
       model.primary_key = :name
@@ -1074,7 +1207,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_finder_with_offset_string
-    assert_nothing_raised(ActiveRecord::StatementInvalid) { Topic.offset("3").to_a }
+    assert_nothing_raised { Topic.offset("3").to_a }
   end
 
   test "find_by with hash conditions returns the first matching record" do
@@ -1145,14 +1278,6 @@ class FinderTest < ActiveRecord::TestCase
   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
-
     def table_with_custom_primary_key
       yield(Class.new(Toy) do
         def self.name