Merge pull request rails#44973 from ushi-as/fix-sql-log-for-unnamed-b…

…inds

activerecord: fix sql log with unnamed binds

activerecord/lib/active_record/log_subscriber.rb

@@ -51,7 +51,14 @@ def sql(event)
 
         binds = []
         payload[:binds].each_with_index do |attr, i|
-          attribute_name = attr.respond_to?(:name) ? attr.name : attr[i].name
+          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)

activerecord/test/cases/bind_parameter_test.rb

@@ -156,6 +156,11 @@ def test_logs_binds_after_type_cast
         assert_logs_binds(binds)
       end
 
+      def test_logs_unnamed_binds
+        binds = ["abcd"]
+        assert_logs_unnamed_binds(binds)
+      end
+
       def test_bind_params_to_sql_with_prepared_statements
         assert_bind_params_to_sql
       end
@@ -281,6 +286,38 @@ def debug(str)
           assert_match %r(\[\["id", 10\]\]\z), logger.debugs.first
         end
 
+        def assert_logs_unnamed_binds(binds)
+          payload = {
+            name: "SQL",
+            sql: "select * from topics where title = $1",
+            binds: binds,
+            type_casted_binds: @connection.send(:type_casted_binds, binds)
+          }
+
+          event = ActiveSupport::Notifications::Event.new(
+            "foo",
+            Time.now,
+            Time.now,
+            123,
+            payload)
+
+          logger = Class.new(ActiveRecord::LogSubscriber) {
+            attr_reader :debugs
+
+            def initialize
+              super
+              @debugs = []
+            end
+
+            def debug(str)
+              @debugs << str
+            end
+          }.new
+
+          logger.sql(event)
+          assert_match %r(\[\[nil, "abcd"\]\]\z), logger.debugs.first
+        end
+
         def assert_filtered_log_binds(binds)
           payload = {
             name: "SQL",