MySQL2 and TrilogyAdapter: stop using #execute as internal API

`#execute` is a public method and using it internaly forces us to expose
private arguments and other dirty things.

Other adapters don't do this, so this bring MySQL in line with others.

Author: byroot

activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -225,18 +225,31 @@ def disable_referential_integrity # :nodoc:
       # Setting +allow_retry+ to true causes the db to reconnect and retry
       # executing the SQL statement in case of a connection-related exception.
       # This option should only be enabled for known idempotent queries.
-      def execute(sql, name = nil, async: false, allow_retry: false)
+      def execute(sql, name = nil, allow_retry: false)
         sql = transform_query(sql)
         check_if_write_query(sql)
 
-        raw_execute(sql, name, async: async, allow_retry: allow_retry)
+        mark_transaction_written_if_write(sql)
+
+        log(sql, name) do
+          with_raw_connection(allow_retry: allow_retry) do |conn|
+            sync_timezone_changes(conn)
+            result = conn.query(sql)
+            handle_warnings(sql)
+            result
+          end
+        end
       end
 
       # Mysql2Adapter doesn't have to free a result after using it, but we use this method
       # to write stuff in an abstract way without concerning ourselves about whether it
       # needs to be explicitly freed or not.
       def execute_and_free(sql, name = nil, async: false) # :nodoc:
-        yield execute(sql, name, async: async)
+        sql = transform_query(sql)
+        check_if_write_query(sql)
+
+        mark_transaction_written_if_write(sql)
+        yield raw_execute(sql, name, async: async)
       end
 
       def begin_db_transaction # :nodoc:
@@ -769,6 +782,8 @@ def sync_timezone_changes(raw_connection)
         end
 
         def internal_execute(sql, name = "SCHEMA", allow_retry: true, uses_transaction: false)
+          sql = transform_query(sql)
+          check_if_write_query(sql)
           raw_execute(sql, name, allow_retry: allow_retry, uses_transaction: uses_transaction)
         end
 

activerecord/lib/active_record/connection_adapters/trilogy_adapter.rb

@@ -71,18 +71,27 @@ def explain(arel, binds = [], options = [])
         end
 
         def exec_query(sql, name = "SQL", binds = [], prepare: false, async: false)
-          result = execute(sql, name, async: async)
+          sql = transform_query(sql)
+          check_if_write_query(sql)
+
+          result = raw_execute(sql, name, async: async)
           ActiveRecord::Result.new(result.fields, result.to_a)
         end
 
         alias exec_without_stmt exec_query
 
         def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
-          execute(to_sql(sql, binds), name)
+          sql = transform_query(sql)
+          check_if_write_query(sql)
+
+          raw_execute(to_sql(sql, binds), name)
         end
 
         def exec_delete(sql, name = nil, binds = [])
-          result = execute(to_sql(sql, binds), name)
+          sql = transform_query(sql)
+          check_if_write_query(sql)
+
+          result = raw_execute(to_sql(sql, binds), name)
           result.affected_rows
         end
 
@@ -214,6 +223,13 @@ def discard!
         end
       end
 
+      def execute(sql, name = nil, allow_retry: false)
+        sql = transform_query(sql)
+        check_if_write_query(sql)
+
+        raw_execute(sql, name, allow_retry: allow_retry)
+      end
+
       def each_hash(result)
         return to_enum(:each_hash, result) unless block_given?