Skip to content

Commit

Permalink
Merge pull request #4 from SantoDE/feature/return-file-name
Browse files Browse the repository at this point in the history
Return File Name alongside error
  • Loading branch information
JamesStewy committed May 4, 2017
2 parents a49ae48 + fee0b8d commit 1f0225e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
18 changes: 9 additions & 9 deletions dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ UNLOCK TABLES;
`

// Creates a MYSQL Dump based on the options supplied through the dumper.
func (d *Dumper) Dump() error {
func (d *Dumper) Dump() (string, error) {
name := time.Now().Format(d.format)
p := path.Join(d.dir, name+".sql")

// Check dump directory
if e, _ := exists(p); e {
return errors.New("Dump '" + name + "' already exists.")
return p, errors.New("Dump '" + name + "' already exists.")
}

// Create .sql file
f, err := os.Create(p)

if err != nil {
return err
return p, err
}

defer f.Close()
Expand All @@ -76,21 +76,21 @@ func (d *Dumper) Dump() error {

// Get server version
if data.ServerVersion, err = getServerVersion(d.db); err != nil {
return err
return p, err
}

// Get tables
tables, err := getTables(d.db)
if err != nil {
return err
return p, err
}

// Get sql for each table
for _, name := range tables {
if t, err := createTable(d.db, name); err == nil {
data.Tables = append(data.Tables, t)
} else {
return err
return p, err
}
}

Expand All @@ -100,13 +100,13 @@ func (d *Dumper) Dump() error {
// Write dump to file
t, err := template.New("mysqldump").Parse(tmpl)
if err != nil {
return err
return p, err
}
if err = t.Execute(f, data); err != nil {
return err
return p, err
}

return nil
return p, nil
}

func getTables(db *sql.DB) ([]string, error) {
Expand Down
6 changes: 5 additions & 1 deletion dump_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,11 @@ func TestDumpOk(t *testing.T) {
dir: "/tmp/",
}

err = dumper.Dump()
path, err := dumper.Dump()

if path == "" {
t.Errorf("No empty path was expected while dumping the database")
}

if err != nil {
t.Errorf("error was not expected while dumping the database: %s", err)
Expand Down

0 comments on commit 1f0225e

Please sign in to comment.