From a49944844fad2edf10ba833937c05f9d9c61d132 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Tue, 3 Apr 2012 12:23:32 -0400
Subject: DATABASE_URL allows omission of database.yml

---
 activerecord/lib/active_record/railtie.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index e94b67cbdc..eb2769f1ef 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -68,7 +68,9 @@ module ActiveRecord
     # and then establishes the connection.
     initializer "active_record.initialize_database" do |app|
       ActiveSupport.on_load(:active_record) do
-        self.configurations = app.config.database_configuration
+        unless ENV['DATABASE_URL']
+          self.configurations = app.config.database_configuration
+        end
         establish_connection
       end
     end
-- 
cgit v1.2.3