diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-01-09 14:37:51 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-01-09 14:37:51 -0800 |
commit | 8a5b480ebb46215210294b87a7ed9f1d8a032312 (patch) | |
tree | ec1fb7f43ce710fa4d571d92241dc06a7b334d20 /activerecord/lib/active_record/railtie.rb | |
parent | da65fe9e11b7f445847228753e6df46d376e29ab (diff) | |
parent | 6cc03675d30b58e28f585720dad14e947a57ff5b (diff) | |
download | rails-8a5b480ebb46215210294b87a7ed9f1d8a032312.tar.gz rails-8a5b480ebb46215210294b87a7ed9f1d8a032312.tar.bz2 rails-8a5b480ebb46215210294b87a7ed9f1d8a032312.zip |
Merge pull request #13582 from schneems/schneems/preserve-connection-behavior
Ensure Active Record connection consistency
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index ec85b3c843..11b564f8f9 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -40,19 +40,7 @@ module ActiveRecord namespace :db do task :load_config do - configuration = if ENV["DATABASE_URL"] - { Rails.env => ENV["DATABASE_URL"] } - else - Rails.application.config.database_configuration || {} - end - - resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(configuration) - - configuration.each do |key, value| - configuration[key] = resolver.resolve(value) if value - end - - ActiveRecord::Tasks::DatabaseTasks.database_configuration = configuration + ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration if defined?(ENGINE_PATH) && engine = Rails::Engine.find(ENGINE_PATH) if engine.paths['db/migrate'].existent @@ -137,7 +125,7 @@ module ActiveRecord end end - self.configurations = app.config.database_configuration || {} + self.configurations = Rails.application.config.database_configuration establish_connection end end |