5 files changed, 46 insertions, 16 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index d3601e0dba..20c6b691fc 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -592,7 +592,6 @@ class EagerAssociationTest < ActiveRecord::TestCase
   # gets raw row hashes from the database and then instantiates them, this test ensures that
   # it only instantiates one actual object per record from the database.
   def test_has_and_belongs_to_many_should_not_instantiate_same_records_multiple_times
-    welcome    = posts(:welcome)
     categories = Category.includes(:posts)
 
     general    = categories.find { |c| c == categories(:general) }
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb
index 8017a49827..800cfbdef9 100644
--- a/activerecord/test/cases/column_test.rb
+++ b/activerecord/test/cases/column_test.rb
@@ -56,6 +56,14 @@ module ActiveRecord
         column = Column.new("field", nil, "integer")
         assert_nil column.type_cast(Object.new)
       end
+
+      if RUBY_VERSION > '1.9'
+        def test_type_cast_nan_and_infinity_to_integer
+          column = Column.new("field", nil, "integer")
+          assert_nil column.type_cast(Float::NAN)
+          assert_nil column.type_cast(1.0/0.0)
+        end
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index e24a5ca5aa..10ee86de4a 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -7,6 +7,19 @@ class LogSubscriberTest < ActiveRecord::TestCase
   include ActiveSupport::LogSubscriber::TestHelper
   include ActiveSupport::BufferedLogger::Severity
 
+  class TestDebugLogSubscriber < ActiveRecord::LogSubscriber
+    attr_reader :debugs
+
+    def initialize
+      @debugs = []
+      super
+    end
+
+    def debug message
+      @debugs << message
+    end
+  end
+
   fixtures :posts
 
   def setup
@@ -32,18 +45,7 @@ class LogSubscriberTest < ActiveRecord::TestCase
   def test_schema_statements_are_ignored
     event = Struct.new(:duration, :payload)
 
-    logger = Class.new(ActiveRecord::LogSubscriber) {
-      attr_accessor :debugs
-
-      def initialize
-        @debugs = []
-        super
-      end
-
-      def debug message
-        @debugs << message
-      end
-    }.new
+    logger = TestDebugLogSubscriber.new
     assert_equal 0, logger.debugs.length
 
     logger.sql(event.new(0, { :sql => 'hi mom!' }))
@@ -56,6 +58,14 @@ class LogSubscriberTest < ActiveRecord::TestCase
     assert_equal 2, logger.debugs.length
   end
 
+  def test_ignore_binds_payload_with_nil_column
+    event = Struct.new(:duration, :payload)
+
+    logger = TestDebugLogSubscriber.new
+    logger.sql(event.new(0, :sql => 'hi mom!', :binds => [[nil, 1]]))
+    assert_equal 1, logger.debugs.length
+  end
+
   def test_basic_query_logging
     Developer.all
     wait
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index 00dc1f6d72..db1ba3549f 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -394,7 +394,6 @@ class PersistencesTest < ActiveRecord::TestCase
 
   def test_update_attribute_with_one_updated
     t = Topic.first
-    title = t.title
     t.update_attribute(:title, 'super_title')
     assert_equal 'super_title', t.title
     assert !t.changed?, "topic should not have changed"
@@ -492,7 +491,7 @@ class PersistencesTest < ActiveRecord::TestCase
 
   def test_update_column_with_one_changed_and_one_updated
     t = Topic.order('id').limit(1).first
-    title, author_name = t.title, t.author_name
+    author_name = t.author_name
     t.author_name = 'John'
     t.update_column(:title, 'super_title')
     assert_equal 'John', t.author_name
diff --git a/activerecord/test/cases/relation/where_test.rb b/activerecord/test/cases/relation/where_test.rb
index b9eef1d32f..80158332f9 100644
--- a/activerecord/test/cases/relation/where_test.rb
+++ b/activerecord/test/cases/relation/where_test.rb
@@ -1,9 +1,11 @@
 require "cases/helper"
 require 'models/post'
+require 'models/comment'
+require 'models/edge'
 
 module ActiveRecord
   class WhereTest < ActiveRecord::TestCase
-    fixtures :posts
+    fixtures :posts, :edges
 
     def test_where_error
       assert_raises(ActiveRecord::StatementInvalid) do
@@ -21,5 +23,17 @@ module ActiveRecord
       post = Post.first
       assert_equal post, Post.where(:posts => { 'id' => post.id }).first
     end
+
+    def test_where_with_table_name_and_empty_hash
+      assert_equal 0, Post.where(:posts => {}).count
+    end
+
+    def test_where_with_table_name_and_empty_array
+      assert_equal 0, Post.where(:id => []).count
+    end
+
+    def test_where_with_empty_hash_and_no_foreign_key
+      assert_equal 0, Edge.where(:sink => {}).count
+    end
   end
 end