Fixes reidmorrison#121 Handle nil bound key

Author: reidmorrison

Gemfile

@@ -11,10 +11,8 @@ gem "minitest"
 gem "rake"
 gem "sprockets", "< 4.0"
 
-gem "rails", "~> 5.0.0"
-gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
-gem "sqlite3", "~> 1.3.0", platform: :ruby
-gem "jdbc-sqlite3", platform: :jruby
+gem "rails", "~> 6.1.0"
+gem "sqlite3", "~> 1.4.0", platform: :ruby
 
 group :development do
   gem "rubocop"

lib/rails_semantic_logger/active_record/log_subscriber.rb

@@ -53,7 +53,7 @@ def sql(event)
 
       # When multiple values are received for a single bound field, it is converted into an array
       def add_bind_value(binds, key, value)
-        key        = key.downcase.to_sym
+        key        = key.downcase.to_sym unless key.nil?
         value      = (Array(binds[key]) << value) if binds.key?(key)
         binds[key] = value
       end
@@ -116,6 +116,16 @@ def bind_values_v5_1_5(payload)
         binds
       end
 
+      def bind_values_v6_1(payload)
+        binds         = {}
+        casted_params = type_casted_binds(payload[:type_casted_binds])
+        payload[:binds].each_with_index do |attr, i|
+          attr_name, value = render_bind(attr, casted_params[i])
+          add_bind_value(binds, attr_name, value)
+        end
+        binds
+      end
+
       def render_bind_v4_2(column, value)
         if column
           if column.binary?
@@ -155,6 +165,21 @@ def render_bind_v5_0_3(attr, value)
         [attr&.name, value]
       end
 
+      def render_bind_v6_1(attr, value)
+        case attr
+        when ActiveModel::Attribute
+          if attr.type.binary? && attr.value
+            value = "<#{attr.value_for_database.to_s.bytesize} bytes of binary data>"
+          end
+        when Array
+          attr = attr.first
+        else
+          attr = nil
+        end
+
+        [attr&.name, value]
+      end
+
       def type_casted_binds_v5_0_3(binds, casted_binds)
         casted_binds || ::ActiveRecord::Base.connection.type_casted_binds(binds)
       end
@@ -172,6 +197,10 @@ def type_casted_binds_v5_1_5(casted_binds)
         alias bind_values bind_values_v5_0_3
         alias render_bind render_bind_v5_0_3
         alias type_casted_binds type_casted_binds_v5_0_3
+      elsif Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR > 0 # ~> 6.1.0
+        alias bind_values bind_values_v6_1
+        alias render_bind render_bind_v6_1
+        alias type_casted_binds type_casted_binds_v5_1_5
       elsif Rails::VERSION::MAJOR >= 5 # ~> 5.1.5 && ~> 5.0.7 && 6.x.x
         alias bind_values bind_values_v5_1_5
         alias render_bind render_bind_v5_0_3

test/active_record_test.rb

@@ -76,6 +76,28 @@ class ActiveRecordTest < Minitest::Test
           assert_equal 1, binds[:limit], -> { actual.ai }
         end
       end
+
+      it "works with an IN clause" do
+        Sample.where(age: [2,3]).first
+
+        SemanticLogger.flush
+        actual = @mock_logger.message
+        assert payload = actual[:payload], -> { actual.ai }
+        assert payload[:sql], -> { actual.ai }
+
+        if Rails.version.to_f >= 5.0
+          assert binds = payload[:binds], -> { actual.ai }
+          if Rails.version.to_f >= 6.1
+            # Rails 6.1 dropped the bound column name
+            # Can be removed once this PR is fixed: https://github.com/rails/rails/pull/41068
+            assert_equal [2, 3], binds[nil], -> { actual.ai }
+          else
+            assert_equal [2, 3], binds[:age], -> { actual.ai }
+          end
+
+          assert_equal 1, binds[:limit], -> { actual.ai }
+        end
+      end
     end
   end
 end