Merge pull request #64 from aziflaj/patch-1

Add support for aliased database configs

Author: etagwerker

lib/database_cleaner/active_record/base.rb

@@ -46,7 +46,12 @@ def connection_class
 
       def load_config
         if db != :default && db.is_a?(Symbol) && File.file?(DatabaseCleaner::ActiveRecord.config_file_location)
-          connection_details = YAML::load(ERB.new(IO.read(DatabaseCleaner::ActiveRecord.config_file_location)).result)
+          connection_details =
+            if RUBY_VERSION.match?(/\A2\.5/)
+              YAML.safe_load(ERB.new(IO.read(DatabaseCleaner::ActiveRecord.config_file_location)).result, [], [], true)
+            else
+              YAML.safe_load(ERB.new(IO.read(DatabaseCleaner::ActiveRecord.config_file_location)).result, aliases: true)
+            end
           @connection_hash   = valid_config(connection_details, db.to_s)
         end
       end

spec/database_cleaner/active_record/base_spec.rb

@@ -38,6 +38,23 @@ module ActiveRecord
           expect(strategy.connection_hash).to eq({ 'database' => 'one' })
         end
 
+        context 'when the configs are aliased' do
+          let(:other_db) { :other_db }
+          let(:config_location) { 'spec/support/aliased-example.database.yml' }
+
+          it 'loads configs correctly' do
+            strategy.db = my_db
+            expected_hash = { 'database' => 'one',
+                              'encoding' => 'utf8',
+                              'reconnect' => true }
+            expect(strategy.connection_hash).to eq(expected_hash)
+
+            strategy.db = other_db
+            expected_hash.merge!('database' => 'two')
+            expect(strategy.connection_hash).to eq(expected_hash)
+          end
+        end
+
         context 'when ActiveRecord configuration contains a config for the given db' do
           if ::ActiveRecord.version >= Gem::Version.new('6.1')
             context 'ActiveRecord >= 6.1' do

spec/support/aliased-example.database.yml

@@ -0,0 +1,11 @@
+default: &default
+  encoding: utf8
+  reconnect: true
+
+my_db:
+  <<: *default
+  database: <%= "ONE".downcase %>
+
+other_db:
+  <<: *default
+  database: <%= "TWO".downcase %>