Merge pull request #1 from macdabby/master

Make code more maintainable

README.md

@@ -6,7 +6,7 @@ Goose is a database migration tool. Manage your database schema by creating incr
 
 ### Goals of this fork
 
-`github.com/pressly/goose` is a fork of `bitbucket.org/liamstask/goose` with the following changes:
+`github.com/discovery-digital/goose` is a fork of `bitbucket.org/liamstask/goose` with the following changes:
 - No config files
 - [Default goose binary](./cmd/goose/main.go) can migrate SQL files only
 - Go migrations:
@@ -28,7 +28,7 @@ Goose is a database migration tool. Manage your database schema by creating incr
 
 # Install
 
-    $ go get -u github.com/pressly/goose/cmd/goose
+    $ go get -u github.com/discovery-digital/goose/cmd/goose
 
 This will install the `goose` binary to your `$GOPATH/bin` directory.
 
@@ -205,7 +205,7 @@ language plpgsql;
 ## Go Migrations
 
 1. Create your own goose binary, see [example](./examples/go-migrations)
-2. Import `github.com/pressly/goose`
+2. Import `github.com/discovery-digital/goose`
 3. Register your migration functions
 4. Run goose command, ie. `goose.Up(db *sql.DB, dir string)`
 
@@ -217,7 +217,7 @@ package migrations
 import (
 	"database/sql"
 
-	"github.com/pressly/goose"
+	"github.com/discovery-digital/goose"
 )
 
 func init() {
@@ -245,7 +245,7 @@ func Down(tx *sql.Tx) error {
 
 Licensed under [MIT License](./LICENSE)
 
-[GoDoc]: https://godoc.org/github.com/pressly/goose
-[GoDoc Widget]: https://godoc.org/github.com/pressly/goose?status.svg
-[Travis]: https://travis-ci.org/pressly/goose
-[Travis Widget]: https://travis-ci.org/pressly/goose.svg?branch=master
+[GoDoc]: https://godoc.org/github.com/discovery-digital/goose
+[GoDoc Widget]: https://godoc.org/github.com/discovery-digital/goose?status.svg
+[Travis]: https://travis-ci.org/discovery-digital/goose
+[Travis Widget]: https://travis-ci.org/discovery-digital/goose.svg?branch=master

cmd/main.go

@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/discovery-digital/goose"
+)
+
+func main() {
+	goose.Command()
+}

examples/go-migrations/main.go → command.go

@@ -1,13 +1,11 @@
-package main
+package goose
 
 import (
 	"database/sql"
 	"flag"
 	"log"
 	"os"
 
-	"github.com/pressly/goose"
-
 	// Init DB drivers.
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/lib/pq"
@@ -20,14 +18,14 @@ var (
 	dir   = flags.String("dir", ".", "directory with migration files")
 )
 
-func main() {
+func Command() {
 	flags.Usage = usage
 	flags.Parse(os.Args[1:])
 
 	args := flags.Args()
 
 	if len(args) > 1 && args[0] == "create" {
-		if err := goose.Run("create", nil, *dir, args[1:]...); err != nil {
+		if err := Run("create", nil, *dir, args[1:]...); err != nil {
 			log.Fatalf("goose run: %v", err)
 		}
 		return
@@ -47,23 +45,13 @@ func main() {
 
 	switch driver {
 	case "postgres", "mysql", "sqlite3", "redshift":
-		if err := goose.SetDialect(driver); err != nil {
+		if err := SetDialect(driver); err != nil {
 			log.Fatal(err)
 		}
 	default:
 		log.Fatalf("%q driver not supported\n", driver)
 	}
 
-	switch dbstring {
-	case "":
-		log.Fatalf("-dbstring=%q not supported\n", dbstring)
-	default:
-	}
-
-	if driver == "redshift" {
-		driver = "postgres"
-	}
-
 	db, err := sql.Open(driver, dbstring)
 	if err != nil {
 		log.Fatalf("-dbstring=%q: %v\n", dbstring, err)
@@ -74,7 +62,7 @@ func main() {
 		arguments = append(arguments, args[3:]...)
 	}
 
-	if err := goose.Run(command, db, *dir, arguments...); err != nil {
+	if err := Run(command, db, *dir, arguments...); err != nil {
 		log.Fatalf("goose run: %v", err)
 	}
 }
@@ -104,6 +92,7 @@ Examples:
     goose postgres "user=postgres dbname=postgres sslmode=disable" status
     goose mysql "user:password@/dbname?parseTime=true" status
     goose redshift "postgres://user:[email protected]:5439/db" status
+    goose tidb "user:password@/dbname?parseTime=true" status
 
 Options:
 `
@@ -115,6 +104,7 @@ Commands:
     down                 Roll back the version by 1
     down-to VERSION      Roll back to a specific VERSION
     redo                 Re-run the latest migration
+    reset                Roll back all migrations
     status               Dump the migration status for the current DB
     version              Print the current version of the database
     create NAME [sql|go] Creates new migration file with next version

create.go

@@ -80,7 +80,7 @@ var goSQLMigrationTemplate = template.Must(template.New("goose.go-migration").Pa
 
 import (
 	"database/sql"
-	"github.com/pressly/goose"
+	"github.com/discovery-digital/goose"
 )
 
 func init() {

examples/go-migrations/README.md

@@ -27,15 +27,10 @@ $
 
 ## Best practice: Split migrations into a standalone package
 
-1. Move [main.go](main.go) into your `cmd/` directory
+1. Move [main.go](main.go) into your `src/cmd/` directory
 
-2. Rename package name in all `*_.go` migration files from `main` to `migrations`.
+2. Adjust the imports to the paths for your project
 
-3. Import this `migrations` package from your custom [cmd/main.go](main.go) file:
+3. Create `src/migrations/` directory with your migrations named `#######_migration_name.go` with the package declared as `migrations`.
 
-    ```go
-    import (
-        // Invoke init() functions within migrations pkg.
-        _ "github.com/pressly/goose/example/migrations-go"
-    )
-    ```
+4. Build the go package: `$ go build -o goose src/cmd/*.go`

examples/go-migrations/custom.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+	// Import your migrations directory here
+	_ "github.com/discovery-digital/goose/examples/go-migrations/migrations"
+	// In your repo, replace "goose" line above with the path to goose:
+	"github.com/discovery-digital/goose"
+)
+
+func main() {
+	goose.Command()
+}

examples/go-migrations/00002_rename_root.go → examples/go-migrations/migrations/00002_rename_root.go

@@ -1,9 +1,8 @@
-package main
+package migrations
 
 import (
 	"database/sql"
-
-	"github.com/pressly/goose"
+	"github.com/discovery-digital/goose"
 )
 
 func init() {

examples/sql-migrations/README.md

@@ -3,7 +3,7 @@
 See [this example](../go-migrations) for Go migrations.
 
 ```bash
-$ go get -u github.com/pressly/goose/cmd/goose
+$ go get -u github.com/discovery-digital/goose/cmd/goose
 ```
 
 ```bash

goose_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestDefaultBinary(t *testing.T) {
 	commands := []string{
-		"go build -i -o goose ./cmd/goose",
+		"go build -i -o goose ./cmd",
 		"./goose -dir=examples/sql-migrations sqlite3 sql.db up",
 		"./goose -dir=examples/sql-migrations sqlite3 sql.db version",
 		"./goose -dir=examples/sql-migrations sqlite3 sql.db down",
@@ -26,11 +26,11 @@ func TestDefaultBinary(t *testing.T) {
 
 func TestCustomBinary(t *testing.T) {
 	commands := []string{
-		"go build -i -o custom-goose ./examples/go-migrations",
-		"./custom-goose -dir=examples/go-migrations sqlite3 go.db up",
-		"./custom-goose -dir=examples/go-migrations sqlite3 go.db version",
-		"./custom-goose -dir=examples/go-migrations sqlite3 go.db down",
-		"./custom-goose -dir=examples/go-migrations sqlite3 go.db status",
+		"go build -i -o custom-goose ./examples/go-migrations/custom.go",
+		"./custom-goose -dir=examples/go-migrations/migrations sqlite3 go.db up",
+		"./custom-goose -dir=examples/go-migrations/migrations sqlite3 go.db version",
+		"./custom-goose -dir=examples/go-migrations/migrations sqlite3 go.db down",
+		"./custom-goose -dir=examples/go-migrations/migrations sqlite3 go.db status",
 	}
 
 	for _, cmd := range commands {

migration.go

@@ -60,7 +60,7 @@ func (m *Migration) run(db *sql.DB, direction bool) error {
 
 	case ".go":
 		if !m.Registered {
-			log.Fatalf("failed to apply Go migration %q: Go functions must be registered and built into a custom binary (see https://github.com/pressly/goose/tree/master/examples/go-migrations)", m.Source)
+			log.Fatalf("failed to apply Go migration %q: Go functions must be registered and built into a custom binary (see https://github.com/discovery-digital/goose/tree/master/examples/go-migrations)", m.Source)
 		}
 		tx, err := db.Begin()
 		if err != nil {