From 8394d5d9bbe51c57edcb48429ac0624ef0a2975b Mon Sep 17 00:00:00 2001
From: Stefan Kaes <stefan.kaes@xing.com>
Date: Thu, 5 Oct 2023 13:07:49 +0200
Subject: [PATCH] adapt active record logging to latest 7.1 features

---
 .../monkey_patches/active_record.rb           | 51 +++++++++++++++----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/lib/time_bandits/monkey_patches/active_record.rb b/lib/time_bandits/monkey_patches/active_record.rb
index 3096975..2529d20 100644
--- a/lib/time_bandits/monkey_patches/active_record.rb
+++ b/lib/time_bandits/monkey_patches/active_record.rb
@@ -68,29 +68,60 @@ def sql(event)
 
     private
     def log_sql_statement(payload, event)
-      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+      name = if payload[:async]
+        "ASYNC #{payload[:name]} (#{payload[:lock_wait].round(1)}ms) (db time #{event.duration.round(1)}ms)"
+      else
+        "#{payload[:name]} (#{event.duration.round(1)}ms)"
+      end
       name  = "CACHE #{name}" if payload[:cached]
       sql   = payload[:sql]
-      binds = nil
-
-      unless (payload[:binds] || []).empty?
-        casted_params = type_casted_binds(payload[:type_casted_binds])
-        binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
-          render_bind(attr, value)
-        }.inspect
-      end
+      binds = render_binds(payload)
 
       name = colorize_payload_name(name, payload[:name])
-      sql  = colorize_sql(sql)
+      sql  = colorize_sql(sql) if colorize_logging
 
       debug "  #{name}  #{sql}#{binds}"
     end
 
     if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("7.1.0")
+      def render_binds(payload)
+        binds = nil
+        if payload[:binds]&.any?
+          casted_params = type_casted_binds(payload[:type_casted_binds])
+
+          binds = []
+          payload[:binds].each_with_index do |attr, i|
+            attribute_name = if attr.respond_to?(:name)
+              attr.name
+            elsif attr.respond_to?(:[]) && attr[i].respond_to?(:name)
+              attr[i].name
+            else
+              nil
+            end
+
+            filtered_params = filter(attribute_name, casted_params[i])
+
+            binds << render_bind(attr, filtered_params)
+          end
+          binds = binds.inspect
+          binds.prepend("  ")
+        end
+        return binds
+      end
       def colorize_sql(sql)
         color(sql, sql_color(sql), bold: true)
       end
     else
+      def render_binds(payload)
+        binds = nil
+        unless (payload[:binds] || []).empty?
+          casted_params = type_casted_binds(payload[:type_casted_binds])
+          binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
+            render_bind(attr, value)
+          }.inspect
+        end
+        return binds
+      end
       def colorize_sql(sql)
         color(sql, sql_color(sql), true)
       end