Merge branch 'development'

sadihakan · Apr 3, 2021 · 8b81c24 · 8b81c24
2 parents b082fbd + 3b0f984
commit 8b81c24
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -14,6 +14,8 @@ type Config struct {
 	DB         string
 	BinaryPath string
 	BackupName string
+	Host       string
+	Port       string
 }
 
 func (c *Config) checkAll() error {

diff --git a/internal/command.go b/internal/command.go
@@ -16,7 +16,7 @@ const (
 	pgFlagCreateDatabase = "-C"
 	pgFlagCreate         = "--create"
 	pgFlagFormat         = "--format=c"
-	pgVersion         = "--version"
+	pgVersion            = "--version"
 	mysqlVersion         = "--version"
 
 	//pgRestore="pg_restore"
@@ -27,6 +27,9 @@ const (
 	mysqlFlagExecute  = "-e"
 	//mysqlImport="mysql"
 	//mysqlDump="mysqldump"
+
+	host = "--host="
+	port = "--port="
 )
 
 // CreateCheckBinaryCommand ...
@@ -77,14 +80,16 @@ func getVersionCommandArg(sourceType config.SourceType) (arg []string) {
 
 // getImportCommandArg ...
 func getImportCommandArg(cfg config.Config) (arg []string) {
+	host := fmt.Sprintf("%s%s", host, cfg.Host)
+	port := fmt.Sprintf("%s%s", port, cfg.Port)
 	switch cfg.Source {
 	case config.PostgreSQL:
 		dns := fmt.Sprintf(`user=%s password=%s dbname=%s`, cfg.User, cfg.Password, cfg.DB)
-		arg = []string{dns, pgFlagCreateDatabase, pgFlagCreate, cfg.Path}
+		arg = []string{dns, host, port, pgFlagCreateDatabase, pgFlagCreate, cfg.Path}
 	case config.MySQL:
 		user := fmt.Sprintf("%s=%s", mysqlFlagUser, cfg.User)
 		password := fmt.Sprintf("%s=\"%s\"", mysqlFlagPassword, cfg.Password)
-		arg = []string{user, password, cfg.DB, mysqlFlagExecute, "source " + cfg.Path}
+		arg = []string{user, password, host, port, cfg.DB, mysqlFlagExecute, "source " + cfg.Path}
 
 	}
 	return arg
@@ -93,14 +98,16 @@ func getImportCommandArg(cfg config.Config) (arg []string) {
 // getExportCommandArg ...
 func getExportCommandArg(cfg config.Config) (arg []string) {
 	filename := fmt.Sprintf("%s", cfg.BackupName)
+	host := fmt.Sprintf("%s%s", host, cfg.Host)
+	port := fmt.Sprintf("%s%s", port, cfg.Port)
 	switch cfg.Source {
 	case config.PostgreSQL:
 		dns := fmt.Sprintf(`user=%s password=%s dbname=%s`, cfg.User, cfg.Password, cfg.DB)
-		arg = []string{dns, pgFlagFileName, filename, pgFlagCreate, pgFlagFormat}
+		arg = []string{dns, host, port, pgFlagCreate, pgFlagFormat, pgFlagFileName, filename}
 	case config.MySQL:
 		user := fmt.Sprintf("%s%s", mysqlFlagUser, cfg.User)
 		password := fmt.Sprintf("%s\"%s\"", mysqlFlagPassword, cfg.Password)
-		arg = []string{user,password, cfg.DB}
+		arg = []string{user, password, host, port, cfg.DB}
 	}
 	return arg
 }