Get rid of with_multi_statement

It's a noop on all adapters except MySQL which doesn't allow multi
statements by default.

Also `batch_execute` in Sqlite3Adapter has to use many ow level APIs
because while sqlite3 allow multi statement by default, you have to use
a different API for that.

So overall `with_multi_statement` was always a lie, because it wouldn't
work on sqlite3 and it's simpler to pass a `batch: true` argument to `raw_execute`
so that each adapter can do the necessary work to allow multi-statement.

This will simplify a future PR that Adrianna will open soon.

Co-Authored-By: Adrianna Chang <[email protected]>

Author: 2 people

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

@@ -224,11 +224,9 @@ def truncate_tables(*table_names) # :nodoc:
 
         return if table_names.empty?
 
-        with_multi_statements do
-          disable_referential_integrity do
-            statements = build_truncate_statements(table_names)
-            execute_batch(statements, "Truncate Tables")
-          end
+        disable_referential_integrity do
+          statements = build_truncate_statements(table_names)
+          execute_batch(statements, "Truncate Tables")
         end
       end
 
@@ -490,11 +488,9 @@ def insert_fixtures_set(fixture_set, tables_to_delete = [])
         table_deletes = tables_to_delete.map { |table| "DELETE FROM #{quote_table_name(table)}" }
         statements = table_deletes + fixture_inserts
 
-        with_multi_statements do
-          transaction(requires_new: true) do
-            disable_referential_integrity do
-              execute_batch(statements, "Fixtures Load")
-            end
+        transaction(requires_new: true) do
+          disable_referential_integrity do
+            execute_batch(statements, "Fixtures Load")
           end
         end
       end
@@ -553,11 +549,11 @@ def internal_exec_query(...) # :nodoc:
 
       private
         # Lowest level way to execute a query. Doesn't check for illegal writes, doesn't annotate queries, yields a native result object.
-        def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true)
+        def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)
           type_casted_binds = type_casted_binds(binds)
           log(sql, name, binds, type_casted_binds, async: async) do |notification_payload|
             with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
-              perform_query(conn, sql, binds, type_casted_binds, prepare: prepare, notification_payload: notification_payload)
+              perform_query(conn, sql, binds, type_casted_binds, prepare: prepare, notification_payload: notification_payload, batch: batch)
             end
           end
         end
@@ -667,10 +663,6 @@ def build_truncate_statements(table_names)
           end
         end
 
-        def with_multi_statements
-          yield
-        end
-
         def combine_multi_statements(total_sql)
           total_sql.join(";\n")
         end

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

@@ -16,9 +16,7 @@ def select_all(*, **) # :nodoc:
         private
           def execute_batch(statements, name = nil)
             combine_multi_statements(statements).each do |statement|
-              with_raw_connection do |conn|
-                raw_execute(statement, name)
-              end
+              raw_execute(statement, name, batch: true)
             end
           end
 
@@ -40,21 +38,12 @@ def multi_statements_enabled?
             end
           end
 
-          def with_multi_statements
-            if multi_statements_enabled?
-              return yield
-            end
-
-            with_raw_connection do |conn|
-              conn.set_server_option(::Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)
-
-              yield
-            ensure
-              conn.set_server_option(::Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)
+          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch: false)
+            reset_multi_statement = if batch && !multi_statements_enabled?
+              raw_connection.set_server_option(::Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)
+              true
             end
-          end
 
-          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:)
             # Make sure we carry over any changes to ActiveRecord.default_timezone that have been
             # made since we established the connection
             raw_connection.query_options[:database_timezone] = default_timezone
@@ -84,6 +73,10 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
             verified!
             handle_warnings(sql)
             result
+          ensure
+            if reset_multi_statement && active?
+              raw_connection.set_server_option(::Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)
+            end
           end
 
           def cast_result(result)

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

@@ -132,7 +132,7 @@ def cancel_any_running_query
           rescue PG::Error
           end
 
-          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:)
+          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch: false)
             update_typemap_for_default_timezone
             result = if prepare
               begin
@@ -193,7 +193,7 @@ def affected_rows(result)
           end
 
           def execute_batch(statements, name = nil)
-            raw_execute(combine_multi_statements(statements), name)
+            raw_execute(combine_multi_statements(statements), name, batch: true)
           end
 
           def build_truncate_statements(table_names)

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

@@ -75,8 +75,10 @@ def internal_begin_transaction(mode, isolation)
             end
           end
 
-          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:)
-            if prepare
+          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch: false)
+            if batch
+              raw_connection.execute_batch2(sql)
+            elsif prepare
               stmt = @statements[sql] ||= raw_connection.prepare(sql)
               stmt.reset!
               stmt.bind_params(type_casted_binds)
@@ -107,7 +109,7 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
             @last_affected_rows = raw_connection.changes
             verified!
 
-            notification_payload[:row_count] = result.length
+            notification_payload[:row_count] = result&.length || 0
             result
           end
 
@@ -123,13 +125,7 @@ def affected_rows(result)
 
           def execute_batch(statements, name = nil)
             sql = combine_multi_statements(statements)
-
-            log(sql, name) do
-              with_raw_connection do |conn|
-                conn.execute_batch2(sql)
-                verified!
-              end
-            end
+            raw_execute(sql, name, batch: true)
           end
 
           def build_fixture_statements(fixture_set)

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

@@ -10,7 +10,12 @@ def exec_insert(sql, name, binds, pk = nil, sequence_name = nil, returning: nil)
         end
 
         private
-          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:)
+          def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:, batch: false)
+            reset_multi_statement = if batch && !@config[:multi_statement]
+              raw_connection.set_server_option(::Trilogy::SET_SERVER_MULTI_STATEMENTS_ON)
+              true
+            end
+
             # Make sure we carry over any changes to ActiveRecord.default_timezone that have been
             # made since we established the connection
             if default_timezone == :local
@@ -27,6 +32,10 @@ def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notif
             handle_warnings(sql)
             notification_payload[:row_count] = result.count
             result
+          ensure
+            if reset_multi_statement && active?
+              raw_connection.set_server_option(::Trilogy::SET_SERVER_MULTI_STATEMENTS_OFF)
+            end
           end
 
           def cast_result(result)
@@ -51,27 +60,7 @@ def last_inserted_id(result)
 
           def execute_batch(statements, name = nil)
             combine_multi_statements(statements).each do |statement|
-              with_raw_connection do |conn|
-                raw_execute(statement, name)
-              end
-            end
-          end
-
-          def multi_statements_enabled?
-            !!@config[:multi_statement]
-          end
-
-          def with_multi_statements
-            if multi_statements_enabled?
-              return yield
-            end
-
-            with_raw_connection do |conn|
-              conn.set_server_option(::Trilogy::SET_SERVER_MULTI_STATEMENTS_ON)
-
-              yield
-            ensure
-              conn.set_server_option(::Trilogy::SET_SERVER_MULTI_STATEMENTS_OFF) if active?
+              raw_execute(statement, name, batch: true)
             end
           end
       end