Commit 5a007a8a authored by Kassio Borges's avatar Kassio Borges

Fix `rails db:*` when the database does not exist

Currently tasks like `rails db:drop && rails db:create` fails due to the
console message that tries to show the database version and since the
database was just dropped it fails.
This fix just verify if the database exists before printing messages
that depends on the database.
parent 3b9944fc
...@@ -6,12 +6,15 @@ if defined?(Rails::Console) ...@@ -6,12 +6,15 @@ if defined?(Rails::Console)
puts '-' * 80 puts '-' * 80
puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision})" puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision})"
puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}" puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}"
puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version
Gitlab.ee do if Gitlab::Database.exists?
if Gitlab::Geo.enabled? puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version
puts " Geo enabled:".ljust(justify) + 'yes'
puts " Geo server:".ljust(justify) + EE::GeoHelper.current_node_human_status Gitlab.ee do
if Gitlab::Geo.connected? && Gitlab::Geo.enabled?
puts " Geo enabled:".ljust(justify) + 'yes'
puts " Geo server:".ljust(justify) + EE::GeoHelper.current_node_human_status
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment