diff options
author | schneems <richard.schneeman@gmail.com> | 2013-12-24 10:12:08 -0500 |
---|---|---|
committer | schneems <richard.schneeman@gmail.com> | 2013-12-24 10:13:12 -0500 |
commit | f0311c24876f78ed2054fb1e5a24d38a4d0db4ac (patch) | |
tree | c114997176b548f286c22b9e9201db3f686e0bd3 /activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | |
parent | 6570448dcd4016f5d8052c450d9a7fbdb9bb0f0e (diff) | |
download | rails-f0311c24876f78ed2054fb1e5a24d38a4d0db4ac.tar.gz rails-f0311c24876f78ed2054fb1e5a24d38a4d0db4ac.tar.bz2 rails-f0311c24876f78ed2054fb1e5a24d38a4d0db4ac.zip |
Raise NoDatabaseError when db does not exist
Building on the work of #13427 this PR adds a helpful error message to the adapters: mysql, mysql2, and sqlite3
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index e790f731ea..6d8e994654 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb @@ -18,6 +18,12 @@ module ActiveRecord client = Mysql2::Client.new(config) options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0] ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config) + rescue Mysql2::Error => error + if error.message.include?("Unknown database") + raise ActiveRecord::NoDatabaseError.new(error.message) + else + raise error + end end end |