Merge pull request rails#55180 from skipkayhil/hm-fix-sqlite-affected-rows-again

Fix affected_rows for SQLite adapter (again)

Author: byroot

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

@@ -103,11 +103,23 @@ 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
+
+                  affected_rows = if (raw_connection.total_changes - total_changes_before_query) > 0
+                    raw_connection.changes
+                  else
+                    0
+                  end
+
                   ActiveRecord::Result.empty(affected_rows: affected_rows)
                 else
                   rows = stmt.to_a
-                  affected_rows = raw_connection.total_changes - total_changes_before_query
+
+                  affected_rows = if (raw_connection.total_changes - total_changes_before_query) > 0
+                    raw_connection.changes
+                  else
+                    0
+                  end
+
                   ActiveRecord::Result.new(stmt.columns, rows, stmt.types.map { |t| type_map.lookup(t) }, affected_rows: affected_rows)
                 end
               ensure

activerecord/test/cases/instrumentation_test.rb

@@ -4,6 +4,8 @@
 require "models/author"
 require "models/book"
 require "models/clothing_item"
+require "models/lesson"
+require "models/student"
 
 module ActiveRecord
   class InstrumentationTest < ActiveRecord::TestCase
@@ -181,6 +183,27 @@ def test_payload_affected_rows
       assert_equal 0, affected_row_values.fifth
     end
 
+    def test_payload_affected_rows_cascade
+      affected_row_values = []
+
+      ActiveSupport::Notifications.subscribed(
+        -> (event) do
+          unless event.payload[:name].in? ["SCHEMA", "TRANSACTION"]
+            affected_row_values << event.payload[:affected_rows]
+          end
+        end,
+        "sql.active_record",
+      ) do
+        l = Lesson.create!(name: "Algebra")
+        l.students.create!(name: "Jim")
+
+        Student.delete_all
+      end
+
+      assert_equal 4, affected_row_values.length
+      assert_equal 1, affected_row_values.fourth
+    end
+
     def test_no_instantiation_notification_when_no_records
       author = Author.create!(id: 100, name: "David")
 

activerecord/test/cases/relation/delete_all_test.rb

@@ -2,8 +2,10 @@
 
 require "cases/helper"
 require "models/author"
+require "models/lesson"
 require "models/post"
 require "models/pet"
+require "models/student"
 require "models/toy"
 require "models/comment"
 require "models/cpk"
@@ -31,10 +33,19 @@ def test_destroy_all
   def test_delete_all
     davids = Author.where(name: "David")
 
-    assert_difference("Author.count", -1) { davids.delete_all }
+    assert_difference("Author.count", -1) do
+      assert_equal 1, davids.delete_all
+    end
     assert_not_predicate davids, :loaded?
   end
 
+  def test_delete_all_return_value_ignores_cascades
+    student = Student.create(name: "Ruy Rocha")
+    lesson = Lesson.create(name: "Anything Possible")
+    student.lessons << lesson
+    assert_equal 1, Student.delete_all
+  end
+
   def test_delete_all_with_index_hint
     davids = Author.where(name: "David").from("#{Author.quoted_table_name} /*! USE INDEX (PRIMARY) */")