Skip to content

Commit 79fd69d

Browse files
committed
Update docs
1 parent fd3ebcf commit 79fd69d

File tree

4 files changed

+43
-29
lines changed

4 files changed

+43
-29
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,10 @@ func main() {
4646
}
4747
fmt.Printf("File is saved to %s", resultFilename)
4848

49-
// Close dumper and connected database
49+
// Close dumper, connected database and file stream.
5050
dumper.Close()
5151
}
52-
5352
```
5453

55-
[![GoDoc](https://godoc.org/github.com/JamesStewy/go-mysqldump?status.svg)](https://godoc.org/github.com/JamesStewy/go-mysqldump)
56-
[![Build Status](https://travis-ci.org/JamesStewy/go-mysqldump.svg?branch=master)](https://travis-ci.org/JamesStewy/go-mysqldump)
54+
[![GoDoc](https://godoc.org/github.com/jamf/go-mysqldump?status.svg)](https://godoc.org/github.com/jamf/go-mysqldump)
55+
[![Build Status](https://travis-ci.org/jamf/go-mysqldump.svg?branch=master)](https://travis-ci.org/jamf/go-mysqldump)

doc.go

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,47 @@ This example uses the mymysql driver (example 7 https://github.com/ziutek/mymysq
88
package main
99
1010
import (
11-
"database/sql"
12-
"fmt"
13-
"github.com/JamesStewy/go-mysqldump"
14-
"github.com/ziutek/mymysql/godrv"
15-
"time"
11+
"database/sql"
12+
"fmt"
13+
14+
"github.com/JamesStewy/go-mysqldump"
15+
"github.com/go-sql-driver/mysql"
1616
)
1717
1818
func main() {
19-
// Register the mymysql driver
20-
godrv.Register("SET NAMES utf8")
21-
2219
// Open connection to database
23-
db, err := sql.Open("mymysql", "tcp:host:port*database/user/password")
24-
if err != nil {
25-
fmt.Println("Error opening databse:", err)
20+
config := mysql.NewConfig()
21+
config.User = "your-user"
22+
config.Passwd = "your-pw"
23+
config.DBName = "your-db"
24+
config.Net = "tcp"
25+
config.Addr = "your-hostname:your-port"
26+
27+
dumpDir := "dumps" // you should create this directory
28+
dumpFilenameFormat := fmt.Sprintf("%s-20060102T150405", dbname) // accepts time layout string and add .sql at the end of file
29+
30+
db, err := sql.Open("mysql", config.FormatDNS())
31+
if err != nil {
32+
fmt.Println("Error opening database: ", err)
2633
return
2734
}
2835
2936
// Register database with mysqldump
30-
dumper, err := mysqldump.Register(db, "dumps", time.ANSIC)
37+
dumper, err := mysqldump.Register(db, dumpDir, dumpFilenameFormat)
3138
if err != nil {
32-
fmt.Println("Error registering databse:", err)
33-
return
39+
fmt.Println("Error registering databse:", err)
40+
return
3441
}
3542
3643
// Dump database to file
37-
err = dumper.Dump()
44+
resultFilename, err := dumper.Dump()
3845
if err != nil {
39-
fmt.Println("Error dumping:", err)
40-
return
46+
fmt.Println("Error dumping:", err)
47+
return
4148
}
49+
fmt.Printf("File is saved to %s", resultFilename)
4250
43-
// Close dumper and connected database
51+
// Close dumper, connected database and file stream.
4452
dumper.Close()
4553
}
4654
*/

dump.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ import (
1212
"time"
1313
)
1414

15-
type table struct {
16-
Name string
17-
SQL string
18-
Values string
19-
}
15+
/*Data struct to configure dump behavior
16+
17+
* Out: Stream to wite to
18+
19+
* Connection: Database connection to dump
2020
21-
// Data struct to configure dump behavior
21+
* IgnoreTables: Mark sensitive tables to ignore
22+
*/
2223
type Data struct {
2324
Out io.Writer
2425
Connection *sql.DB
@@ -31,6 +32,12 @@ type Data struct {
3132
wg sync.WaitGroup
3233
}
3334

35+
type table struct {
36+
Name string
37+
SQL string
38+
Values string
39+
}
40+
3441
type metaData struct {
3542
DumpVersion string
3643
ServerVersion string

mysqldump.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func Dump(db *sql.DB, out io.Writer) error {
5353
}
5454

5555
// Close the dumper.
56-
// Will also close the database the dumper is connected to.
56+
// Will also close the database the dumper is connected to as well as the out stream if it is a *os.File.
5757
//
5858
// Not required.
5959
func (d *Data) Close() error {

0 commit comments

Comments
 (0)