Merge pull request reidmorrison#92 from alachaum/rails6-activerecord-logger

Fix logging of SQL queries when query cache is in use

Author: reidmorrison

lib/rails_semantic_logger/active_record/log_subscriber.rb

@@ -165,13 +165,13 @@ def type_casted_binds_v5_1_5(casted_binds)
       if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR.zero? && Rails::VERSION::TINY <= 2 # 5.0.0 - 5.0.2
         alias bind_values bind_values_v5_0_0
         alias render_bind render_bind_v5_0_0
-      elsif Rails::VERSION::MAJOR >= 5 &&
+      elsif Rails::VERSION::MAJOR == 5 &&
             ((Rails::VERSION::MINOR.zero? && Rails::VERSION::TINY <= 6) ||
               (Rails::VERSION::MINOR == 1 && Rails::VERSION::TINY <= 4)) # 5.0.3 - 5.0.6 && 5.1.0 - 5.1.4
         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 >= 5 # ~> 5.1.5 && ~> 5.0.7
+      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
         alias type_casted_binds type_casted_binds_v5_1_5

test/active_record_test.rb

@@ -30,6 +30,22 @@ class ActiveRecordTest < Minitest::Test
         assert actual[:payload][:sql], actual[:payload]
       end
 
+      it 'sql with query cache' do
+        Sample.cache { 2.times { Sample.where(name: 'foo').first } }
+
+        SemanticLogger.flush
+        actual = @mock_logger.message
+
+        if Rails.version.to_f >= 5.1
+          assert actual[:message].include?('Sample'), actual[:message]
+        else
+          assert actual[:message].include?('CACHE'), actual[:message]
+        end
+
+        assert actual[:payload], actual
+        assert actual[:payload][:sql], actual[:payload]
+      end
+
       it 'single bind value' do
         Sample.where(name: 'Jack').first