Merge pull request rails#52402 from jhawthorn/avoid_extra_pings

Use raw connection for Trilogy more_results

Author: jhawthorn

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

@@ -6,16 +6,11 @@ module Mysql2
       module DatabaseStatements
         # Returns an ActiveRecord::Result instance.
         def select_all(*, **) # :nodoc:
-          result = nil
-          with_raw_connection do |conn|
-            result = if ExplainRegistry.collect? && prepared_statements
-              unprepared_statement { super }
-            else
-              super
-            end
-            conn.abandon_results!
+          if ExplainRegistry.collect? && prepared_statements
+            unprepared_statement { super }
+          else
+            super
           end
-          result
         end
 
         def internal_exec_query(sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false) # :nodoc:
@@ -60,7 +55,6 @@ def execute_batch(statements, name = nil)
             combine_multi_statements(statements).each do |statement|
               with_raw_connection do |conn|
                 raw_execute(statement, name)
-                conn.abandon_results!
               end
             end
           end
@@ -102,6 +96,7 @@ def raw_execute(sql, name, async: false, allow_retry: false, materialize_transac
               with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
                 sync_timezone_changes(conn)
                 result = conn.query(sql)
+                conn.abandon_results!
                 verified!
                 handle_warnings(sql)
                 notification_payload[:row_count] = result&.size || 0

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

@@ -4,14 +4,6 @@ module ActiveRecord
   module ConnectionAdapters
     module Trilogy
       module DatabaseStatements
-        def select_all(*, **) # :nodoc:
-          result = super
-          with_raw_connection do |conn|
-            conn.next_result while conn.more_results_exist?
-          end
-          result
-        end
-
         def internal_exec_query(sql, name = "SQL", binds = [], prepare: false, async: false, allow_retry: false) # :nodoc:
           sql = transform_query(sql)
           check_if_write_query(sql)
@@ -47,6 +39,9 @@ def raw_execute(sql, name, async: false, allow_retry: false, materialize_transac
               with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
                 sync_timezone_changes(conn)
                 result = conn.query(sql)
+                while conn.more_results_exist?
+                  conn.next_result
+                end
                 verified!
                 handle_warnings(sql)
                 notification_payload[:row_count] = result.count
@@ -77,7 +72,6 @@ def execute_batch(statements, name = nil)
             combine_multi_statements(statements).each do |statement|
               with_raw_connection do |conn|
                 raw_execute(statement, name)
-                conn.next_result while conn.more_results_exist?
               end
             end
           end