Ensure that preventing writes is invoked before `materialize_transactions` consistently

1 files changed, 2 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
index e1b791fe41..6adcc14545 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
@@ -40,8 +40,6 @@ module ActiveRecord
         end
 
         def exec_query(sql, name = "SQL", binds = [], prepare: false)
-          materialize_transactions
-
           if without_prepared_statement?(binds)
             execute_and_free(sql, name) do |result|
               if result
@@ -62,8 +60,6 @@ module ActiveRecord
         end
 
         def exec_delete(sql, name = nil, binds = [])
-          materialize_transactions
-
           if without_prepared_statement?(binds)
             execute_and_free(sql, name) { @connection.affected_rows }
           else
@@ -126,6 +122,8 @@ module ActiveRecord
               raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"
             end
 
+            materialize_transactions
+
             # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been
             # made since we established the connection
             @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone