improve url building for dump filename

ManageIQ · Oct 15, 2018 · 689c08f · 689c08f
1 parent 28a79ac
commit 689c08f
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/lib/evm_database_ops.rb b/lib/evm_database_ops.rb
@@ -114,19 +114,14 @@ def self.restore(db_opts, connect_opts = {})
         connect_opts[:uri] = File.dirname(connect_opts[:uri])
       else
         connect_opts[:remote_file_name] ||= File.basename(backup_file_name(action))
-        backup_folder = if connect_opts[:skip_directory]
-                          []
-                        elsif action == :dump
-                          "db_dump"
-                        else
-                          "db_backup"
-                        end
         #
         # If the passed in URI contains query parameters, ignore them
         # when creating the dump file name. They'll be used in the session object.
         #
-        connect_opts_uri = connect_opts[:uri].split('?')[0]
-        uri = File.join(connect_opts_uri, backup_folder, connect_opts[:remote_file_name])
+        uri_parts = [connect_opts[:uri].split('?')[0]]
+        uri_parts << (action == :dump ? "db_dump" : "db_backup") unless connect_opts[:skip_directory]
+        uri_parts << connect_opts[:remote_file_name]
+        uri = File.join(uri_parts)
       end
     else
       uri = db_opts[:local_file]