diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-20 07:10:36 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-20 07:10:36 -0800 |
| commit | 3a0b6c8e135e268c1550f93db1b63ba27457dec2 (patch) | |
| tree | a192d86909d0f404a81eb3518bb106336c8f673b /activerecord/lib/active_record/connection_adapters/connection_specification.rb | |
| parent | ebae71a67a6c4d0421efd932b2af88c48b8b1c7c (diff) | |
| parent | b1de1892bc0f228da307346e029c37602ff3f5a8 (diff) | |
| download | rails-3a0b6c8e135e268c1550f93db1b63ba27457dec2.tar.gz rails-3a0b6c8e135e268c1550f93db1b63ba27457dec2.tar.bz2 rails-3a0b6c8e135e268c1550f93db1b63ba27457dec2.zip | |
Merge pull request #9120 from hone/db_migrate_with_database_url
fix rake db:migrate when used with ENV['DATABASE_URL']
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/connection_specification.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb index 873f1ad3d4..5b60185f53 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -38,7 +38,7 @@ module ActiveRecord private def resolve_string_connection(spec) # :nodoc: hash = configurations.fetch(spec) do |k| - connection_url_to_hash(k) + self.class.connection_url_to_hash(k) end raise(AdapterNotSpecified, "#{spec} database is not configured") unless hash @@ -69,7 +69,7 @@ module ActiveRecord SIMPLE_INT = /\A\d+\z/ SIMPLE_FLOAT = /\A\d+\.\d+\z/ - def connection_url_to_hash(url) # :nodoc: + def self.connection_url_to_hash(url) # :nodoc: config = URI.parse url adapter = config.scheme adapter = "postgresql" if adapter == "postgres" |