Simplify some perform_query implementation

Inline simple operations like reseting the timezone.

Author: byroot

activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -770,12 +770,6 @@ def warning_ignored?(warning)
           warning.level == "Note" || super
         end
 
-        # Make sure we carry over any changes to ActiveRecord.default_timezone that have been
-        # made since we established the connection
-        def sync_timezone_changes(raw_connection)
-          raise NotImplementedError
-        end
-
         # See https://dev.mysql.com/doc/mysql-errors/en/server-error-reference.html
         ER_DB_CREATE_EXISTS     = 1007
         ER_FILSORT_ABORT        = 1028

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

@@ -14,10 +14,6 @@ def select_all(*, **) # :nodoc:
         end
 
         private
-          def sync_timezone_changes(raw_connection)
-            raw_connection.query_options[:database_timezone] = default_timezone
-          end
-
           def execute_batch(statements, name = nil)
             combine_multi_statements(statements).each do |statement|
               with_raw_connection do |conn|
@@ -59,7 +55,9 @@ def with_multi_statements
           end
 
           def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:)
-            sync_timezone_changes(raw_connection)
+            # 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
 
             result = if prepare
               stmt = @statements[sql] ||= raw_connection.prepare(sql)

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -981,9 +981,9 @@ def reconfigure_connection_timezone
           # If using Active Record's time zone support configure the connection
           # to return TIMESTAMP WITH ZONE types in UTC.
           if default_timezone == :utc
-            internal_execute("SET SESSION timezone TO 'UTC'", "SCHEMA")
+            raw_execute("SET SESSION timezone TO 'UTC'", "SCHEMA")
           else
-            internal_execute("SET SESSION timezone TO DEFAULT", "SCHEMA")
+            raw_execute("SET SESSION timezone TO DEFAULT", "SCHEMA")
           end
         end
 

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

@@ -11,7 +11,14 @@ def exec_insert(sql, name, binds, pk = nil, sequence_name = nil, returning: nil)
 
         private
           def perform_query(raw_connection, sql, binds, type_casted_binds, prepare:, notification_payload:)
-            sync_timezone_changes(raw_connection)
+            # Make sure we carry over any changes to ActiveRecord.default_timezone that have been
+            # made since we established the connection
+            if default_timezone == :local
+              raw_connection.query_flags |= ::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
+            else
+              raw_connection.query_flags &= ~::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
+            end
+
             result = raw_connection.query(sql)
             while raw_connection.more_results_exist?
               raw_connection.next_result
@@ -42,15 +49,6 @@ def last_inserted_id(result)
             end
           end
 
-          def sync_timezone_changes(conn)
-            # Sync any changes since connection last established.
-            if default_timezone == :local
-              conn.query_flags |= ::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
-            else
-              conn.query_flags &= ~::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
-            end
-          end
-
           def execute_batch(statements, name = nil)
             combine_multi_statements(statements).each do |statement|
               with_raw_connection do |conn|