From 2b6d1da6b4f2a5dc1d51223ddb33b86ceab98479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Mon, 7 Apr 2014 19:17:06 -0300
Subject: Only call DEFAULT_ENV proc one time

---
 activerecord/lib/active_record/connection_handling.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb
index 567d121091..a1fb83fde5 100644
--- a/activerecord/lib/active_record/connection_handling.rb
+++ b/activerecord/lib/active_record/connection_handling.rb
@@ -70,10 +70,13 @@ module ActiveRecord
 
       private
         def config
+          env = DEFAULT_ENV.call.to_s
+
           cfg = Hash.new do |hash, key|
             entry = @raw_config[key]
             env_url = nil
-            if key.to_s == DEFAULT_ENV.call.to_s
+
+            if key.to_s == env
               env_url = ENV["DATABASE_URL"]
             end
             env_url ||= ENV["DATABASE_URL_#{key.upcase}"]
@@ -83,7 +86,7 @@ module ActiveRecord
           end
 
           @raw_config.keys.each {|k| cfg[k] }
-          cfg[DEFAULT_ENV.call.to_s]
+          cfg[env]
 
           cfg
         end
-- 
cgit v1.2.3