Permalink
Browse files

Merge pull request #13541 from schneems/schneems/db-url-sub-key

Allow "url" sub key in database.yml configuration
  • Loading branch information...
2 parents 16e9356 + 5b96027 commit 969a0778cd2fd809a7b4f60c8477bb6d0ac9faf3 @rafaelfranca rafaelfranca committed Dec 31, 2013
View
6 activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Connection specification now accepts a "url" key. The value of this
+ key is expected to contain a database URL. The database URL will be
+ expanded into a hash and merged.
+
+ *Richard Schneeman*
+
* An `ArgumentError` is now raised on a call to `Relation#where.not(nil)`.
Example:
View
8 activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -223,7 +223,15 @@ def resolve_env_connection(spec)
end
end
+ # Accepts a hash. Expands the "url" key that contains a
+ # URL database connection to a full connection
+ # hash and merges with the rest of the hash.
+ # Connection details inside of the "url" key win any merge conflicts
def resolve_hash_connection(spec)
+ if url = spec.delete("url")
+ connection_hash = resolve_string_connection(url)
+ spec.merge!(connection_hash)
+ end
spec
end
View
18 activerecord/test/cases/connection_specification/resolver_test.rb
@@ -31,6 +31,24 @@ def test_url_from_environment
"encoding" => "utf8" }, spec)
end
+ def test_url_sub_key
+ spec = resolve :production, 'production' => {"url" => 'abstract://foo?encoding=utf8'}
+ assert_equal({
+ "adapter" => "abstract",
+ "host" => "foo",
+ "encoding" => "utf8" }, spec)
+ end
+
+ def test_url_sub_key_merges_correctly
+ hash = {"url" => 'abstract://foo?encoding=utf8&', "adapter" => "sqlite3", "host" => "bar", "pool" => "3"}
+ spec = resolve :production, 'production' => hash
+ assert_equal({
+ "adapter" => "abstract",
+ "host" => "foo",
+ "encoding" => "utf8",
+ "pool" => "3" }, spec)
+ end
+
def test_url_host_no_db
spec = resolve 'abstract://foo?encoding=utf8'
assert_equal({

0 comments on commit 969a077

Please sign in to comment.