From 35a69f048dbefd7adbe262db94026171466a2202 Mon Sep 17 00:00:00 2001 From: Simon Wikstrand Date: Mon, 4 Dec 2017 18:51:48 +0100 Subject: [PATCH 1/3] Added documentation, and support in the cmd binary for tidb --- README.md | 1 + cmd/goose/main.go | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 95eb7a0..efedf5b 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ Examples: goose postgres "user=postgres dbname=postgres sslmode=disable" status goose mysql "user:password@/dbname?parseTime=true" status goose redshift "postgres://user:password@qwerty.us-east-1.redshift.amazonaws.com:5439/db" status + goose tidb "user:password@/dbname?parseTime=true" status ``` ## create diff --git a/cmd/goose/main.go b/cmd/goose/main.go index 43fce0f..4a0a251 100644 --- a/cmd/goose/main.go +++ b/cmd/goose/main.go @@ -46,7 +46,7 @@ func main() { driver, dbstring, command := args[0], args[1], args[2] switch driver { - case "postgres", "mysql", "sqlite3", "redshift": + case "postgres", "mysql", "sqlite3", "redshift", "tidb": if err := goose.SetDialect(driver); err != nil { log.Fatal(err) } @@ -64,6 +64,10 @@ func main() { driver = "postgres" } + if driver == "tidb" { + driver = "mysql" + } + db, err := sql.Open(driver, dbstring) if err != nil { log.Fatalf("-dbstring=%q: %v\n", dbstring, err) @@ -104,6 +108,7 @@ Examples: goose postgres "user=postgres dbname=postgres sslmode=disable" status goose mysql "user:password@/dbname?parseTime=true" status goose redshift "postgres://user:password@qwerty.us-east-1.redshift.amazonaws.com:5439/db" status + goose tidb "user:password@/dbname?parseTime=true" status Options: ` From 3f3c7a46a917cd70dc7e41479867a83d9b9ee39b Mon Sep 17 00:00:00 2001 From: Simon Wikstrand Date: Mon, 4 Dec 2017 18:53:54 +0100 Subject: [PATCH 2/3] Changed tabs to spaces in string --- cmd/goose/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/goose/main.go b/cmd/goose/main.go index 4a0a251..d46752c 100644 --- a/cmd/goose/main.go +++ b/cmd/goose/main.go @@ -108,7 +108,7 @@ Examples: goose postgres "user=postgres dbname=postgres sslmode=disable" status goose mysql "user:password@/dbname?parseTime=true" status goose redshift "postgres://user:password@qwerty.us-east-1.redshift.amazonaws.com:5439/db" status - goose tidb "user:password@/dbname?parseTime=true" status + goose tidb "user:password@/dbname?parseTime=true" status Options: ` From c09709c16720b59c64aa8eb0853d9564f2dc9ca8 Mon Sep 17 00:00:00 2001 From: Simon Wikstrand Date: Wed, 6 Dec 2017 12:08:46 +0100 Subject: [PATCH 3/3] Improved internal driver conversion --- cmd/goose/main.go | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/cmd/goose/main.go b/cmd/goose/main.go index d46752c..6e726fb 100644 --- a/cmd/goose/main.go +++ b/cmd/goose/main.go @@ -45,13 +45,15 @@ func main() { driver, dbstring, command := args[0], args[1], args[2] + if err := goose.SetDialect(driver); err != nil { + log.Fatal(err) + } + switch driver { - case "postgres", "mysql", "sqlite3", "redshift", "tidb": - if err := goose.SetDialect(driver); err != nil { - log.Fatal(err) - } - default: - log.Fatalf("%q driver not supported\n", driver) + case "redshift": + driver = "postgres" + case "tidb": + driver = "mysql" } switch dbstring { @@ -60,14 +62,6 @@ func main() { default: } - if driver == "redshift" { - driver = "postgres" - } - - if driver == "tidb" { - driver = "mysql" - } - db, err := sql.Open(driver, dbstring) if err != nil { log.Fatalf("-dbstring=%q: %v\n", dbstring, err)