From 77516a712b5f10d14727d807697272b4607db7bc Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Tue, 8 Jan 2013 01:28:23 -0200
Subject: Ignore binds payload with nil column in AR log subscriber

Some tests were raising the following error:

    Could not log "sql.active_record" event. NoMethodError: undefined method
    `type' for nil:NilClass`

Due to the way binds were being logged, the column info was considered
always present, but that is not true for some of the tests listed in the
issue.

Closes #8806.
---
 activerecord/lib/active_record/log_subscriber.rb | 12 ++++---
 activerecord/test/cases/log_subscriber_test.rb   | 42 +++++++++++++++---------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index 2366a91bb5..c1ba524c84 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -21,13 +21,15 @@ module ActiveRecord
     end
 
     def render_bind(column, value)
-      if column.type == :binary
-        rendered_value = "<#{value.bytesize} bytes of binary data>"
+      if column
+        if column.binary?
+          value = "<#{value.bytesize} bytes of binary data>"
+        end
+
+        [column.name, value]
       else
-        rendered_value = value
+        [nil, value]
       end
-
-      [column.name, rendered_value]
     end
 
     def sql(event)
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index 345e83a102..57eac0c175 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -8,6 +8,19 @@ class LogSubscriberTest < ActiveRecord::TestCase
   include ActiveSupport::LogSubscriber::TestHelper
   include ActiveSupport::Logger::Severity
 
+  class TestDebugLogSubscriber < ActiveRecord::LogSubscriber
+    attr_reader :debugs
+
+    def initialize
+      @debugs = []
+      super
+    end
+
+    def debug message
+      @debugs << message
+    end
+  end
+
   fixtures :posts
 
   def setup
@@ -30,30 +43,27 @@ 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!' }))
+    logger.sql(event.new(0, sql: 'hi mom!'))
     assert_equal 1, logger.debugs.length
 
-    logger.sql(event.new(0, { :sql => 'hi mom!', :name => 'foo' }))
+    logger.sql(event.new(0, sql: 'hi mom!', name: 'foo'))
     assert_equal 2, logger.debugs.length
 
-    logger.sql(event.new(0, { :sql => 'hi mom!', :name => 'SCHEMA' }))
+    logger.sql(event.new(0, sql: 'hi mom!', name: 'SCHEMA'))
     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.load
     wait
@@ -105,7 +115,7 @@ class LogSubscriberTest < ActiveRecord::TestCase
   def test_binary_data_is_not_logged
     skip if current_adapter?(:Mysql2Adapter)
 
-    Binary.create(:data => 'some binary data')
+    Binary.create(data: 'some binary data')
     wait
     assert_match(/<16 bytes of binary data>/, @logger.logged(:debug).join)
   end
-- 
cgit v1.2.3