TECH-4739: Clean up mysql and mysql column adapter checks

Invoca · Sep 11, 2020 · 9960faa · 9960faa
1 parent c6eba7c
commit 9960faa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/lib/active_record/mysql/enum/enum_column_adapter.rb b/lib/active_record/mysql/enum/enum_column_adapter.rb
@@ -8,7 +8,7 @@ module Mysql
     module Enum
 
       class << self
-        def current_mysql_column_adapter
+        def mysql_column_adapter
           if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
             ActiveRecord::ConnectionAdapters::Mysql2Adapter::Column
           elsif defined? ActiveRecord::ConnectionAdapters::MySQL::Column
@@ -19,7 +19,7 @@ def current_mysql_column_adapter
         end
       end
 
-      ActiveRecordColumnWithEnums = Enum.current_mysql_column_adapter
+      ActiveRecordColumnWithEnums = Enum.mysql_column_adapter
 
       module EnumColumnAdapter
         def initialize(*)

diff --git a/lib/active_record/mysql/enum/mysql_adapter.rb b/lib/active_record/mysql/enum/mysql_adapter.rb
@@ -5,16 +5,14 @@ module Mysql
     module Enum
 
       class << self
-        def current_mysql_adapter
-          if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
-            ActiveRecord::ConnectionAdapters::Mysql2Adapter
-          else
-            raise "Could not find MySQL connection adapter"
-          end
+        def mysql_adapter
+          defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter or raise "Could not find MySQL connection adapter"
+
+          ActiveRecord::ConnectionAdapters::Mysql2Adapter
         end
       end
 
-      ActiveRecordMysqlAdapter = Enum.current_mysql_adapter
+      ActiveRecordMysqlAdapter = Enum.mysql_adapter
 
       module MysqlAdapter
         def native_database_types #:nodoc

diff --git a/spec/unit/enum_column_adapter_spec.rb b/spec/unit/enum_column_adapter_spec.rb
@@ -21,7 +21,7 @@
     end
 
     it "raises" do
-      expect { ActiveRecord::Mysql::Enum.current_mysql_column_adapter }.to raise_error(RuntimeError, "could not find MySQL::Column or equivalent connection adapter")
+      expect { ActiveRecord::Mysql::Enum.mysql_column_adapter }.to raise_error(RuntimeError, "could not find MySQL::Column or equivalent connection adapter")
     end
   end
 

diff --git a/spec/unit/mysql_adapter_spec.rb b/spec/unit/mysql_adapter_spec.rb
@@ -17,7 +17,7 @@
     end
 
     it "raises" do
-      expect { ActiveRecord::Mysql::Enum.current_mysql_adapter }.to raise_error(RuntimeError, "Could not find MySQL connection adapter")
+      expect { ActiveRecord::Mysql::Enum.mysql_adapter }.to raise_error(RuntimeError, "Could not find MySQL connection adapter")
     end
   end