Merge pull request #1147 from koic/support_trilogy_adapter_for_mysql

Support the Trilogy adapter for MySQL

Author: koic

changelog/new_support_trilogy_adapter_for_mysql.md

@@ -0,0 +1 @@
+* [#1147](https://github.com/rubocop/rubocop-rails/issues/1147): Support the Trilogy adapter for MySQL. ([@koic][])

lib/rubocop/cop/mixin/database_type_resolvable.rb

@@ -21,7 +21,7 @@ def database_from_yaml
         return unless database_yaml
 
         case database_adapter
-        when 'mysql2'
+        when 'mysql2', 'trilogy'
           MYSQL
         when 'postgresql'
           POSTGRESQL
@@ -33,7 +33,7 @@ def database_from_env
         return unless url
 
         case url
-        when %r{\Amysql2://}
+        when %r{\A(mysql2|trilogy)://}
           MYSQL
         when %r{\Apostgres(ql)?://}
           POSTGRESQL

lib/rubocop/cop/rails/bulk_change_table.rb

@@ -14,7 +14,7 @@ module Rails
       # automatically detect an adapter from `development` environment
       # in `config/database.yml` or the environment variable `DATABASE_URL`
       # when the `Database` option is not set.
-      # If the adapter is not `mysql2` or `postgresql`,
+      # If the adapter is not `mysql2`, `trilogy`, or `postgresql`,
       # this Cop ignores offenses.
       #
       # @example

spec/rubocop/cop/rails/bulk_change_table_spec.rb

@@ -479,6 +479,34 @@ def change
       end
     end
 
+    context 'trilogy' do
+      context 'with top-level adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'adapter' => 'trilogy'
+            }
+          }
+        end
+
+        it_behaves_like 'offense for mysql'
+      end
+
+      context 'with nested adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'primary' => {
+                'adapter' => 'trilogy'
+              }
+            }
+          }
+        end
+
+        it_behaves_like 'offense for mysql'
+      end
+    end
+
     context 'postgresql' do
       context 'with top-level adapter configuration' do
         let(:yaml) do
@@ -541,6 +569,12 @@ def change
       it_behaves_like 'offense for mysql'
     end
 
+    context 'trilogy' do
+      let(:database_url) { 'trilogy://localhost/my_database' }
+
+      it_behaves_like 'offense for mysql'
+    end
+
     context 'postgres' do
       let(:database_url) { 'postgres://localhost/my_database' }