mysql password fixed

sadihakan · Mar 31, 2021 · 579e766 · 579e766
1 parent d13fc15
commit 579e766
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/example/dummy_dump_example.go b/example/dummy_dump_example.go
@@ -7,15 +7,15 @@ import (
 
 func main() {
 	dd , err:= dummydump.New(&config.Config{
-		Source:     "postgres",
+		Source:     "mysql",
 		Import:     false,
 		Export:     true,
-		User:       "hakankosanoglu",
-		Password:   "",
+		User:       "testuser",
+		Password:   "123456",
 		Path:       "",
-		DB:         "testt",
-		BinaryPath: "/usr/local/opt/postgresql@12/bin/pg_dump",
-		BackupName: "hakan",
+		DB:         "deneme",
+		BinaryPath: "/usr/bin/mysqldump",
+		BackupName: "deneme",
 	})
 
 	if err != nil {

diff --git a/internal/command.go b/internal/command.go
@@ -59,7 +59,9 @@ func getImportCommandArg(cfg config.Config) (arg []string) {
 		dns := fmt.Sprintf(`user=%s password=%s dbname=%s`, cfg.User, cfg.Password, cfg.DB)
 		arg = []string{dns, pgFlagCreateDatabase, pgFlagCreate, cfg.Path}
 	case config.MySQL:
-		arg = []string{mysqlFlagUser, cfg.User, mysqlFlagPassword, cfg.Password, cfg.DB, mysqlFlagExecute, "source " + cfg.Path}
+		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}
 
 	}
 	return arg
@@ -73,7 +75,9 @@ func getExportCommandArg(cfg config.Config) (arg []string) {
 		dns := fmt.Sprintf(`user=%s password=%s dbname=%s`, cfg.User, cfg.Password, cfg.DB)
 		arg = []string{dns, pgFlagFileName, filename, pgFlagCreate, pgFlagFormat}
 	case config.MySQL:
-		arg = []string{mysqlFlagUser, cfg.User, mysqlFlagPassword, cfg.Password, cfg.DB}
+		user := fmt.Sprintf("%s%s", mysqlFlagUser, cfg.User)
+		password := fmt.Sprintf("%s%s", mysqlFlagPassword, cfg.Password)
+		arg = []string{user,password, cfg.DB}
 	}
 	return arg
 }

diff --git a/internal/mysql.go b/internal/mysql.go
@@ -2,6 +2,7 @@ package internal
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"github.com/sadihakan/dummy-dump/config"
 	"io/ioutil"
@@ -36,16 +37,17 @@ func (m MySQL) Check() error {
 func (m MySQL) Export(dump config.Config) error {
 	filename := fmt.Sprintf("%d.backup", time.Now().UTC().UnixNano())
 	cmd := CreateExportCommand(dump)
-	var outb bytes.Buffer
-	cmd.Stderr = os.Stderr
+	fmt.Println(cmd)
+	var outb, errBuf bytes.Buffer
+	cmd.Stderr = &errBuf
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = &outb
 	err := cmd.Run()
 	if err != nil {
-		return err
+		return errors.New(errBuf.String())
 	}
 
-	err = ioutil.WriteFile(filename,outb.Bytes(),0644)
+	err = ioutil.WriteFile(filename, outb.Bytes(), 0644)
 	return err
 }