diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-04-09 01:41:11 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-04-09 01:46:48 +0930 |
| commit | d72a0cbc807a14d3eec02a53317d11b9d9fa5815 (patch) | |
| tree | 19727f545f516c39720a9f2277de6c810a1f731c /activerecord/lib/active_record/connection_adapters/connection_specification.rb | |
| parent | 88cd65b174d9a75d9cb0e5e06a57615ccc80fff1 (diff) | |
| download | rails-d72a0cbc807a14d3eec02a53317d11b9d9fa5815.tar.gz rails-d72a0cbc807a14d3eec02a53317d11b9d9fa5815.tar.bz2 rails-d72a0cbc807a14d3eec02a53317d11b9d9fa5815.zip | |
Drop in @jeremy's new database.yml template text
In passing, allow multi-word adapters to be referenced in a URL:
underscored_name must become hyphened-name.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/connection_specification.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/connection_specification.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb index 0cc92fa397..a8ab52be74 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -33,7 +33,7 @@ module ActiveRecord def initialize(url) raise "Database URL cannot be empty" if url.blank? @uri = URI.parse(url) - @adapter = @uri.scheme + @adapter = @uri.scheme.gsub('-', '_') @adapter = "postgresql" if @adapter == "postgres" if @uri.opaque |