Merge pull request #1056 from mjankowski/database-adapter-detection

Fix database adapter detection for nested config
rubocop · Aug 7, 2023 · 6202d3e · 6202d3e
2 parents 541da7c + e80345a
commit 6202d3e
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 17 deletions.
diff --git a/changelog/change_fix_database_adapter_detection_for.md b/changelog/change_fix_database_adapter_detection_for.md
@@ -0,0 +1 @@
+* [#1056](https://github.com/rubocop/rubocop-rails/pull/1056): Fix database adapter detection for nested config. ([@mjankowski][])
diff --git a/lib/rubocop/cop/rails/bulk_change_table.rb b/lib/rubocop/cop/rails/bulk_change_table.rb
@@ -181,14 +181,18 @@ def database
         def database_from_yaml
           return nil unless database_yaml
 
-          case database_yaml['adapter']
+          case database_adapter
           when 'mysql2'
             MYSQL
           when 'postgresql'
             POSTGRESQL
           end
         end
 
+        def database_adapter
+          database_yaml['adapter'] || database_yaml.first.last['adapter']
+        end
+
         def database_yaml
           return nil unless File.exist?('config/database.yml')
 

diff --git a/spec/rubocop/cop/rails/bulk_change_table_spec.rb b/spec/rubocop/cop/rails/bulk_change_table_spec.rb
@@ -452,32 +452,70 @@ def change
     end
 
     context 'mysql2' do
-      let(:yaml) do
-        {
-          'development' => {
-            'adapter' => 'mysql2'
+      context 'with top-level adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'adapter' => 'mysql2'
+            }
           }
-        }
+        end
+
+        it_behaves_like 'offense for mysql'
       end
 
-      it_behaves_like 'offense for mysql'
+      context 'with nested adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'primary' => {
+                'adapter' => 'mysql2'
+              }
+            }
+          }
+        end
+
+        it_behaves_like 'offense for mysql'
+      end
     end
 
     context 'postgresql' do
-      let(:yaml) do
-        {
-          'development' => {
-            'adapter' => 'postgresql'
+      context 'with top-level adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'adapter' => 'postgresql'
+            }
           }
-        }
-      end
+        end
 
-      context 'with Rails 5.2', :rails52 do
-        it_behaves_like 'offense for postgresql'
+        context 'with Rails 5.2', :rails52 do
+          it_behaves_like 'offense for postgresql'
+        end
+
+        context 'with Rails 5.1', :rails51 do
+          it_behaves_like 'no offense for postgresql'
+        end
       end
 
-      context 'with Rails 5.1', :rails51 do
-        it_behaves_like 'no offense for postgresql'
+      context 'with nested adapter configuration' do
+        let(:yaml) do
+          {
+            'development' => {
+              'primary' => {
+                'adapter' => 'postgresql'
+              }
+            }
+          }
+        end
+
+        context 'with Rails 5.2', :rails52 do
+          it_behaves_like 'offense for postgresql'
+        end
+
+        context 'with Rails 5.1', :rails51 do
+          it_behaves_like 'no offense for postgresql'
+        end
       end
     end