Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raise TypeError instead of infinite loop in resolve_connection #36848

Merged
merged 1 commit into from Aug 7, 2019
Merged

Raise TypeError instead of infinite loop in resolve_connection #36848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/connection_adapters/connection_specification.rb
View file
Open in desktop
Expand Up @@ -221,7 +221,7 @@ def resolve_connection(config_or_env, pool_name = nil)
when Hash
resolve_hash_connection config_or_env
else
resolve_connection config_or_env
raise TypeError, "Invalid type for configuration. Expected Symbol, String, or Hash. Got #{config_or_env.inspect}"
end
end

Expand Down
6 changes: 6 additions & 0 deletions activerecord/test/cases/connection_specification/resolver_test.rb
View file
Open in desktop
Expand Up @@ -135,6 +135,12 @@ def test_spec_name_with_inline_config
spec = spec("adapter" => "sqlite3")
assert_equal "primary", spec.name, "should default to primary id"
end

def test_spec_with_invalid_type
assert_raises TypeError do
spec(Object.new)
end
end
end
end
end
Expand Down