diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-07-24 22:08:16 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-07-24 22:08:16 +0930 |
| commit | fa78378f764402ddcb910660c788d19b5f85c253 (patch) | |
| tree | 590d28b67eeb335747e137454006883bf0390b61 /activerecord/lib | |
| parent | 2a67e12fdb832a6b6e94bed1a0b05290019f5514 (diff) | |
| parent | c0932162d27f4a41455893d38ef55cb1cc606575 (diff) | |
| download | rails-fa78378f764402ddcb910660c788d19b5f85c253.tar.gz rails-fa78378f764402ddcb910660c788d19b5f85c253.tar.bz2 rails-fa78378f764402ddcb910660c788d19b5f85c253.zip | |
Merge pull request #16280 from a3gis/master
Fixes #16265 and correct documentation typo
Diffstat (limited to 'activerecord/lib')
| -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 2fcb085ab2..5693031053 100644 --- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb +++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb @@ -160,7 +160,7 @@ module ActiveRecord # config = { "production" => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" } } # spec = Resolver.new(config).spec(:production) # spec.adapter_method - # # => "sqlite3" + # # => "sqlite3_connection" # spec.config # # => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" } # @@ -250,7 +250,7 @@ module ActiveRecord # Connection details inside of the "url" key win any merge conflicts def resolve_hash_connection(spec) if spec["url"] && spec["url"] !~ /^jdbc:/ - connection_hash = resolve_string_connection(spec.delete("url")) + connection_hash = resolve_url_connection(spec.delete("url")) spec.merge!(connection_hash) end spec |