From 344bed41d0bb29bb7964b695e51a333395bd43f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fran=C3=A7a?= <rafael@franca.dev>
Date: Fri, 26 Jul 2019 12:58:55 -0400
Subject: Merge pull request #36372 from instructure-bridge/6-0-stable

Don't break configurations.each, .first before the deprecation period
---
 .../lib/active_record/database_configurations.rb         | 16 +++++++++++++---
 activerecord/test/cases/database_configurations_test.rb  | 13 ++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb
index 8baa0f5af6..3e387782f6 100644
--- a/activerecord/lib/active_record/database_configurations.rb
+++ b/activerecord/lib/active_record/database_configurations.rb
@@ -91,6 +91,19 @@ module ActiveRecord
     end
     alias :blank? :empty?
 
+    def each
+      throw_getter_deprecation(:each)
+      configurations.each { |config|
+        yield [config.env_name, config.config]
+      }
+    end
+
+    def first
+      throw_getter_deprecation(:first)
+      config = configurations.first
+      [config.env_name, config.config]
+    end
+
     private
       def env_with_configs(env = nil)
         if env
@@ -176,9 +189,6 @@ module ActiveRecord
 
       def method_missing(method, *args, &blk)
         case method
-        when :each, :first
-          throw_getter_deprecation(method)
-          configurations.send(method, *args, &blk)
         when :fetch
           throw_getter_deprecation(method)
           configs_for(env_name: args.first)
diff --git a/activerecord/test/cases/database_configurations_test.rb b/activerecord/test/cases/database_configurations_test.rb
index ed8151f01a..725d1b5d1b 100644
--- a/activerecord/test/cases/database_configurations_test.rb
+++ b/activerecord/test/cases/database_configurations_test.rb
@@ -80,17 +80,20 @@ class LegacyDatabaseConfigurationsTest < ActiveRecord::TestCase
 
   def test_each_is_deprecated
     assert_deprecated do
-      ActiveRecord::Base.configurations.each do |db_config|
-        assert_equal "primary", db_config.spec_name
+      all_configs = ActiveRecord::Base.configurations.values
+      ActiveRecord::Base.configurations.each do |env_name, config|
+        assert_includes ["arunit", "arunit2", "arunit_without_prepared_statements"], env_name
+        assert_includes all_configs, config
       end
     end
   end
 
   def test_first_is_deprecated
+    first_config = ActiveRecord::Base.configurations.values.first
     assert_deprecated do
-      db_config = ActiveRecord::Base.configurations.first
-      assert_equal "arunit", db_config.env_name
-      assert_equal "primary", db_config.spec_name
+      env_name, config = ActiveRecord::Base.configurations.first
+      assert_equal "arunit", env_name
+      assert_equal first_config, config
     end
   end
 
-- 
cgit v1.2.3