diff options
| author | Terence Lee <hone02@gmail.com> | 2013-02-21 01:13:10 +1100 |
|---|---|---|
| committer | Terence Lee <hone02@gmail.com> | 2013-02-21 01:25:05 +1100 |
| commit | 4bdaf95b82a1358b11bbfb857a1ac2790136a4ef (patch) | |
| tree | 3882f08781365e81a2aa9f3046d7175b2dae4574 /activerecord/lib/active_record/railtie.rb | |
| parent | ebae71a67a6c4d0421efd932b2af88c48b8b1c7c (diff) | |
| download | rails-4bdaf95b82a1358b11bbfb857a1ac2790136a4ef.tar.gz rails-4bdaf95b82a1358b11bbfb857a1ac2790136a4ef.tar.bz2 rails-4bdaf95b82a1358b11bbfb857a1ac2790136a4ef.zip | |
standardize database_configuration to a hash
make connection_url_to_hash a class method
This als prevents loading database.yml if it doesn't exist
but DATABASE_URL does
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index aceb70bc45..a979be6999 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -141,9 +141,7 @@ module ActiveRecord # and then establishes the connection. initializer "active_record.initialize_database" do |app| ActiveSupport.on_load(:active_record) do - unless ENV['DATABASE_URL'] - self.configurations = app.config.database_configuration - end + self.configurations = app.config.database_configuration establish_connection end end |