Rename MySQL::DatabaseStatements => Mysql2::DatabaseStatements

Author: adrianna-chang-shopify

activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb renamed to activerecord/lib/active_record/connection_adapters/mysql2/database_statements.rb

@@ -2,7 +2,7 @@
 
 module ActiveRecord
   module ConnectionAdapters
-    module MySQL
+    module Mysql2
       module DatabaseStatements
         # Returns an ActiveRecord::Result instance.
         def select_all(*, **) # :nodoc:
@@ -120,7 +120,7 @@ def multi_statements_enabled?
             if flags.is_a?(Array)
               flags.include?("MULTI_STATEMENTS")
             else
-              flags.anybits?(Mysql2::Client::MULTI_STATEMENTS)
+              flags.anybits?(::Mysql2::Client::MULTI_STATEMENTS)
             end
           end
 
@@ -130,11 +130,11 @@ def with_multi_statements
             end
 
             with_raw_connection do |conn|
-              conn.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)
+              conn.set_server_option(::Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)
 
               yield
             ensure
-              conn.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)
+              conn.set_server_option(::Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)
             end
           end
 

activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "active_record/connection_adapters/abstract_mysql_adapter"
-require "active_record/connection_adapters/mysql/database_statements"
+require "active_record/connection_adapters/mysql2/database_statements"
 
 gem "mysql2", "~> 0.5"
 require "mysql2"
@@ -28,12 +28,12 @@ class Mysql2Adapter < AbstractMysqlAdapter
 
       ADAPTER_NAME = "Mysql2"
 
-      include MySQL::DatabaseStatements
+      include Mysql2::DatabaseStatements
 
       class << self
         def new_client(config)
-          Mysql2::Client.new(config)
-        rescue Mysql2::Error => error
+          ::Mysql2::Client.new(config)
+        rescue ::Mysql2::Error => error
           if error.error_number == ConnectionAdapters::Mysql2Adapter::ER_BAD_DB_ERROR
             raise ActiveRecord::NoDatabaseError.db_error(config[:database])
           elsif error.error_number == ConnectionAdapters::Mysql2Adapter::ER_ACCESS_DENIED_ERROR
@@ -54,7 +54,7 @@ def initialize(...)
         if @config[:flags].kind_of? Array
           @config[:flags].push "FOUND_ROWS"
         else
-          @config[:flags] |= Mysql2::Client::FOUND_ROWS
+          @config[:flags] |= ::Mysql2::Client::FOUND_ROWS
         end
 
         @connection_parameters ||= @config
@@ -159,9 +159,9 @@ def get_full_version
         end
 
         def translate_exception(exception, message:, sql:, binds:)
-          if exception.is_a?(Mysql2::Error::TimeoutError) && !exception.error_number
+          if exception.is_a?(::Mysql2::Error::TimeoutError) && !exception.error_number
             ActiveRecord::AdapterTimeout.new(message, sql: sql, binds: binds)
-          elsif exception.is_a?(Mysql2::Error::ConnectionError)
+          elsif exception.is_a?(::Mysql2::Error::ConnectionError)
             if exception.message.match?(/MySQL client is not connected/i)
               ActiveRecord::ConnectionNotEstablished.new(exception)
             else