Prefer result.affected_rows over ivar

Author: kamipo

activerecord/lib/active_record/connection_adapters/sqlite3/database_statements.rb

@@ -85,6 +85,7 @@ def internal_begin_transaction(mode, isolation)
 
           def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch: false)
             total_changes_before_query = raw_connection.total_changes
+            affected_rows = nil
 
             if batch
               raw_connection.execute_batch2(sql)
@@ -102,20 +103,20 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
                 end
                 result = if stmt.column_count.zero? # No return
                   stmt.step
-                  @affected_rows = raw_connection.total_changes - total_changes_before_query
-                  ActiveRecord::Result.empty(affected_rows: @affected_rows)
+                  affected_rows = raw_connection.total_changes - total_changes_before_query
+                  ActiveRecord::Result.empty(affected_rows: affected_rows)
                 else
                   rows = stmt.to_a
-                  @affected_rows = raw_connection.total_changes - total_changes_before_query
-                  ActiveRecord::Result.new(stmt.columns, rows, stmt.types.map { |t| type_map.lookup(t) }, affected_rows: @affected_rows)
+                  affected_rows = raw_connection.total_changes - total_changes_before_query
+                  ActiveRecord::Result.new(stmt.columns, rows, stmt.types.map { |t| type_map.lookup(t) }, affected_rows: affected_rows)
                 end
               ensure
                 stmt.close unless prepare
               end
             end
             verified!
 
-            notification_payload[:affected_rows] = @affected_rows
+            notification_payload[:affected_rows] = affected_rows
             notification_payload[:row_count] = result&.length || 0
             result
           end
@@ -127,7 +128,7 @@ def cast_result(result)
           end
 
           def affected_rows(result)
-            @affected_rows
+            result.affected_rows
           end
 
           def execute_batch(statements, name = nil, **kwargs)

activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

@@ -149,7 +149,6 @@ def initialize(...)
           end
         end
 
-        @last_affected_rows = nil
         @previous_read_uncommitted = nil
         @config[:strict] = ConnectionAdapters::SQLite3Adapter.strict_strings_by_default unless @config.key?(:strict)