Convert port settings to String.

alvir · Nov 21, 2021 · 42acb49 · 42acb49
1 parent d91918b
commit 42acb49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/dump_hook.rb b/lib/dump_hook.rb
@@ -82,6 +82,8 @@ def store_dump(filename)
                  Hooks::Postgres.new(connection_settings)
                when :mysql
                  Hooks::MySql.new(connection_settings)
+               else
+                 raise "Unsupported type of source"
                end
       dumper.dump(filename_with_namespace)
     end
@@ -97,6 +99,8 @@ def restore_dump(filename)
                  Hooks::Postgres.new(connection_settings)
                when :mysql
                  Hooks::MySql.new(connection_settings)
+               else
+                 raise "Unsupported type of source"
                end
       dumper.restore(filename_with_namespace)
     end

diff --git a/lib/dump_hook/hooks/mysql.rb b/lib/dump_hook/hooks/mysql.rb
@@ -10,15 +10,15 @@ def dump(filename)
         args << "--compress"
         args.concat(["--result-file", filename])
         args.concat(["--ignore-table", "#{@connection_settings.database}.schema_migrations"])
-        args.concat ['--user', @connection_settings.username] if @connection_settings.username
+        args.concat(['--user', @connection_settings.username]) if @connection_settings.username
         args << "--password=#{@connection_settings.password}" if @connection_settings.password
         Kernel.system("mysqldump", *args)
       end
 
       def restore(filename)
         args = [@connection_settings.database]
-        args.concat ["-e", "source #{filename}"]
-        args.concat ['--user', @connection_settings.username] if @connection_settings.username
+        args.concat(["-e", "source #{filename}"])
+        args.concat(['--user', @connection_settings.username]) if @connection_settings.username
         args << "--password=#{@connection_settings.password}" if @connection_settings.password
         Kernel.system("mysql", *args)
       end

diff --git a/lib/dump_hook/hooks/postgres.rb b/lib/dump_hook/hooks/postgres.rb
@@ -10,15 +10,15 @@ def dump(filename)
         args.concat(['-d', @connection_settings.database])
         args.concat(['-U', @connection_settings.username]) if @connection_settings.username
         args.concat(['-h', @connection_settings.host]) if @connection_settings.host
-        args.concat(['-p', @connection_settings.port]) if @connection_settings.port
+        args.concat(['-p', @connection_settings.port.to_s]) if @connection_settings.port
         Kernel.system("pg_dump", *args)
       end
 
       def restore(filename)
         args = ['-d', @connection_settings.database]
         args.concat(['-U', @connection_settings.username]) if @connection_settings.username
         args.concat(['-h', @connection_settings.host]) if @connection_settings.host
-        args.concat(['-p', @connection_settings.port]) if @connection_settings.port
+        args.concat(['-p', @connection_settings.port.to_s]) if @connection_settings.port
         args << filename
         Kernel.system("pg_restore", *args)
       end