Internally it's just MySQL

We don't need to reflect specific adapter naming. Default driver for
MySQL in rails 7.1 will be Trilogy. It's a detail not in our scope of
interest. We only need to be sure which data types are allowed for given
database.

Co-authored-by: Piotr Jurewicz <[email protected]>

Author: fidel

ruby_event_store-active_record/lib/ruby_event_store/active_record/generators/database_adapter.rb

@@ -16,7 +16,7 @@ def initialize(data_type = NOT_SET)
         end
       end
 
-      class MySQL2 < self
+      class MySQL < self
         SUPPORTED_DATA_TYPES = %w[binary json].freeze
 
         def initialize(data_type = NOT_SET)
@@ -64,7 +64,7 @@ def self.from_string(adapter_name, data_type = NOT_SET)
         when "postgresql", "postgis"
           PostgreSQL.new(data_type)
         when "mysql2"
-          MySQL2.new(data_type)
+          MySQL.new(data_type)
         when "sqlite"
           SQLite.new(data_type)
         else

ruby_event_store-active_record/lib/ruby_event_store/active_record/generators/templates/template_directory.rb

@@ -7,7 +7,7 @@ def self.for_adapter(database_adapter)
         case database_adapter
         when DatabaseAdapter::PostgreSQL
           "postgres/"
-        when DatabaseAdapter::MySQL2
+        when DatabaseAdapter::MySQL
           "mysql/"
         end
       end

ruby_event_store-active_record/spec/database_adapter_spec.rb

@@ -8,18 +8,18 @@ module ActiveRecord
       specify "from_string" do
         expect(DatabaseAdapter.from_string("PostgreSQL")).to eql(DatabaseAdapter::PostgreSQL.new)
         expect(DatabaseAdapter.from_string("PostGIS")).to eql(DatabaseAdapter::PostgreSQL.new)
-        expect(DatabaseAdapter.from_string("MySQL2")).to eql(DatabaseAdapter::MySQL2.new)
+        expect(DatabaseAdapter.from_string("MySQL2")).to eql(DatabaseAdapter::MySQL.new)
         expect(DatabaseAdapter.from_string("SQLite")).to eql(DatabaseAdapter::SQLite.new)
       end
 
       specify "equality" do
-        expect(DatabaseAdapter::PostgreSQL.new).not_to eql(DatabaseAdapter::MySQL2.new)
+        expect(DatabaseAdapter::PostgreSQL.new).not_to eql(DatabaseAdapter::MySQL.new)
         expect(DatabaseAdapter::PostgreSQL.new).not_to eql("postgresql")
       end
 
       specify "adapter_name" do
         expect(DatabaseAdapter::PostgreSQL.new.adapter_name).to eql("postgresql")
-        expect(DatabaseAdapter::MySQL2.new.adapter_name).to eql("mysql2")
+        expect(DatabaseAdapter::MySQL.new.adapter_name).to eql("mysql2")
         expect(DatabaseAdapter::SQLite.new.adapter_name).to eql("sqlite")
       end
 
@@ -40,13 +40,13 @@ module ActiveRecord
 
       specify "hash" do
         expect(DatabaseAdapter::PostgreSQL.new.hash).to eql(DatabaseAdapter.hash ^ "postgresql".hash)
-        expect(DatabaseAdapter::MySQL2.new.hash).to eql(DatabaseAdapter.hash ^ "mysql2".hash)
+        expect(DatabaseAdapter::MySQL.new.hash).to eql(DatabaseAdapter.hash ^ "mysql2".hash)
         expect(DatabaseAdapter::SQLite.new.hash).to eql(DatabaseAdapter.hash ^ "sqlite".hash)
       end
 
       specify "child classes don't implement #from_string" do
         expect { DatabaseAdapter::PostgreSQL.from_string("postgresql") }.to raise_error(NoMethodError)
-        expect { DatabaseAdapter::MySQL2.from_string("mysql2") }.to raise_error(NoMethodError)
+        expect { DatabaseAdapter::MySQL.from_string("mysql2") }.to raise_error(NoMethodError)
         expect { DatabaseAdapter::SQLite.from_string("sqlite") }.to raise_error(NoMethodError)
       end
 
@@ -56,16 +56,16 @@ module ActiveRecord
 
       context "data type verification" do
         specify "MySQL supports binary" do
-          expect(DatabaseAdapter::MySQL2.new("binary").data_type).to eq("binary")
+          expect(DatabaseAdapter::MySQL.new("binary").data_type).to eq("binary")
         end
 
         specify "MySQL supports json" do
-          expect(DatabaseAdapter::MySQL2.new("json").data_type).to eq("json")
+          expect(DatabaseAdapter::MySQL.new("json").data_type).to eq("json")
         end
 
         specify "MySQL doesn't support jsonb" do
-          expect { DatabaseAdapter::MySQL2.new("jsonb") }.to raise_error InvalidDataTypeForAdapter,
-                      "MySQL2 doesn't support \"jsonb\". Supported types are: binary, json."
+          expect { DatabaseAdapter::MySQL.new("jsonb") }.to raise_error InvalidDataTypeForAdapter,
+                                                                        "MySQL doesn't support \"jsonb\". Supported types are: binary, json."
         end
 
         specify "PostgreSQL supports binary" do

ruby_event_store-active_record/spec/migration_generator_spec.rb

@@ -73,14 +73,14 @@ module ActiveRecord
         )
       end
 
-      specify "throws on attempt to create migration with jsonb data type for MySQL2 adapter" do
+      specify "throws on attempt to create migration with jsonb data type for MySQL adapter" do
         expect { migration_generator(@dir, "jsonb", "MySQL2") }.to raise_error(
           InvalidDataTypeForAdapter,
-          "MySQL2 doesn't support \"jsonb\". Supported types are: binary, json."
+          "MySQL doesn't support \"jsonb\". Supported types are: binary, json."
         )
       end
 
-      specify "creates migration with binary data type for MySQL2 adapter" do
+      specify "creates migration with binary data type for MySQL adapter" do
         migration_generator(@dir, "binary", "MySQL2")
 
         expect(read_migration(@dir)).to match(/t.binary\s+:data/)