diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-14 17:34:05 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-01-14 17:34:05 +0000 |
commit | 3bf9b6604b577931a9bceaa23032bb6675b999e8 (patch) | |
tree | 7d402da2f86c04cee85d3643abcc7bb4ba0f3e0e | |
parent | 9920ede2573a2f74946376cc86ede6c28ec78678 (diff) | |
parent | e348af1d4c29f2aa7fb03a7910fd816850caab11 (diff) | |
download | gitlab-ce-3bf9b6604b577931a9bceaa23032bb6675b999e8.tar.gz |
Merge branch 'rescue_database_error' into 'master'
Rescue database error
We need to check which database is setup but we cannot assume that the database exists already. Not checking this will break rake gitlab:setup for packaging as we need to do asset precompile before the database exists.
See merge request !1393
-rw-r--r-- | lib/gitlab/current_settings.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 5d88a601dea..22ad7ef8c8b 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -8,7 +8,7 @@ module Gitlab else fake_application_settings end - rescue ActiveRecord::NoDatabaseError + rescue ActiveRecord::NoDatabaseError, database_adapter.constantize::Error fake_application_settings end end @@ -22,5 +22,16 @@ module Gitlab sign_in_text: Settings.extra['sign_in_text'], ) end + + # We need to check which database is setup + # but we cannot assume that the database exists already. + # Not checking this will break "rake gitlab:setup". + def database_adapter + if Rails.configuration.database_configuration[Rails.env]['adapter'] == 'mysql2' + "Mysql2" + else + "PG" + end + end end end |