Use v4 for Go module support

Prometheus2677 · FPiety0521 · commit e3cd91d79a82 · 2018-10-10T16:16:23.000-07:00
diff --git a/README.md b/README.md
@@ -107,9 +107,9 @@ __[Go Documentation](https://godoc.org/github.com/golang-migrate/migrate)__
 
 ```go
 import (
-    "github.com/golang-migrate/migrate/v3"
-    _ "github.com/golang-migrate/migrate/v3/database/postgres"
-    _ "github.com/golang-migrate/migrate/v3/source/github"
+    "github.com/golang-migrate/migrate/v4"
+    _ "github.com/golang-migrate/migrate/v4/database/postgres"
+    _ "github.com/golang-migrate/migrate/v4/source/github"
 )
 
 func main() {
@@ -126,9 +126,9 @@ Want to use an existing database client?
 import (
     "database/sql"
     _ "github.com/lib/pq"
-    "github.com/golang-migrate/migrate/v3"
-    "github.com/golang-migrate/migrate/v3/database/postgres"
-    _ "github.com/golang-migrate/migrate/v3/source/file"
+    "github.com/golang-migrate/migrate/v4"
+    "github.com/golang-migrate/migrate/v4/database/postgres"
+    _ "github.com/golang-migrate/migrate/v4/source/file"
 )
 
 func main() {
diff --git a/cli/build_aws-s3.go b/cli/build_aws-s3.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/aws_s3"
+	_ "github.com/golang-migrate/migrate/v4/source/aws_s3"
 )
diff --git a/cli/build_cassandra.go b/cli/build_cassandra.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/cassandra"
+	_ "github.com/golang-migrate/migrate/v4/database/cassandra"
 )
diff --git a/cli/build_clickhouse.go b/cli/build_clickhouse.go
@@ -3,6 +3,6 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/clickhouse"
+	_ "github.com/golang-migrate/migrate/v4/database/clickhouse"
 	_ "github.com/kshvakov/clickhouse"
 )
diff --git a/cli/build_cockroachdb.go b/cli/build_cockroachdb.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/cockroachdb"
+	_ "github.com/golang-migrate/migrate/v4/database/cockroachdb"
 )
diff --git a/cli/build_github.go b/cli/build_github.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/github"
+	_ "github.com/golang-migrate/migrate/v4/source/github"
 )
diff --git a/cli/build_go-bindata.go b/cli/build_go-bindata.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/go_bindata"
+	_ "github.com/golang-migrate/migrate/v4/source/go_bindata"
 )
diff --git a/cli/build_godoc-vfs.go b/cli/build_godoc-vfs.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/godoc_vfs"
+	_ "github.com/golang-migrate/migrate/v4/source/godoc_vfs"
 )
diff --git a/cli/build_google-cloud-storage.go b/cli/build_google-cloud-storage.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/source/google_cloud_storage"
+	_ "github.com/golang-migrate/migrate/v4/source/google_cloud_storage"
 )
diff --git a/cli/build_mysql.go b/cli/build_mysql.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/mysql"
+	_ "github.com/golang-migrate/migrate/v4/database/mysql"
 )
diff --git a/cli/build_postgres.go b/cli/build_postgres.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/postgres"
+	_ "github.com/golang-migrate/migrate/v4/database/postgres"
 )
diff --git a/cli/build_ql.go b/cli/build_ql.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/ql"
+	_ "github.com/golang-migrate/migrate/v4/database/ql"
 )
diff --git a/cli/build_redshift.go b/cli/build_redshift.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/redshift"
+	_ "github.com/golang-migrate/migrate/v4/database/redshift"
 )
diff --git a/cli/build_spanner.go b/cli/build_spanner.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/spanner"
+	_ "github.com/golang-migrate/migrate/v4/database/spanner"
 )
diff --git a/cli/build_sqlite3.go b/cli/build_sqlite3.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/golang-migrate/migrate/v3/database/sqlite3"
+	_ "github.com/golang-migrate/migrate/v4/database/sqlite3"
 )
diff --git a/cli/commands.go b/cli/commands.go
@@ -3,9 +3,9 @@ package main
 import (
 	"errors"
 	"fmt"
-	"github.com/golang-migrate/migrate/v3"
-	_ "github.com/golang-migrate/migrate/v3/database/stub" // TODO remove again
-	_ "github.com/golang-migrate/migrate/v3/source/file"
+	"github.com/golang-migrate/migrate/v4"
+	_ "github.com/golang-migrate/migrate/v4/database/stub" // TODO remove again
+	_ "github.com/golang-migrate/migrate/v4/source/file"
 	"os"
 	"path/filepath"
 	"strconv"
diff --git a/cli/main.go b/cli/main.go
@@ -10,9 +10,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
-	"github.com/golang-migrate/migrate/v3/source"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
+	"github.com/golang-migrate/migrate/v4/source"
 )
 
 const defaultTimeFormat = "20060102150405"
diff --git a/database/cassandra/cassandra.go b/database/cassandra/cassandra.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/gocql/gocql"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4/database"
 )
 
 func init() {
diff --git a/database/cassandra/cassandra_test.go b/database/cassandra/cassandra_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gocql/gocql"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
+	mt "github.com/golang-migrate/migrate/v4/testing"
 )
 
 var versions = []mt.Version{
diff --git a/database/clickhouse/clickhouse.go b/database/clickhouse/clickhouse.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
 )
 
 var DefaultMigrationsTable = "schema_migrations"
diff --git a/database/cockroachdb/cockroachdb.go b/database/cockroachdb/cockroachdb.go
@@ -17,8 +17,8 @@ import (
 )
 
 import (
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
 )
 
 func init() {
diff --git a/database/cockroachdb/cockroachdb_test.go b/database/cockroachdb/cockroachdb_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	"bytes"
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
+	mt "github.com/golang-migrate/migrate/v4/testing"
 	"github.com/lib/pq"
 )
 
diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
@@ -20,8 +20,8 @@ import (
 )
 
 import (
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
 )
 
 func init() {
diff --git a/database/mysql/mysql_test.go b/database/mysql/mysql_test.go
@@ -13,8 +13,8 @@ import (
 )
 
 import (
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
+	mt "github.com/golang-migrate/migrate/v4/testing"
 )
 
 var versions = []mt.Version{
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/lib/pq"
 )
 
diff --git a/database/postgres/postgres_test.go b/database/postgres/postgres_test.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"testing"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	mt "github.com/golang-migrate/migrate/v3/testing"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
+	mt "github.com/golang-migrate/migrate/v4/testing"
 )
 
 var versions = []mt.Version{
diff --git a/database/ql/ql.go b/database/ql/ql.go
@@ -10,8 +10,8 @@ import (
 	nurl "net/url"
 
 	_ "github.com/cznic/ql/driver"
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
 )
 
 func init() {
diff --git a/database/ql/ql_test.go b/database/ql/ql_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 
 	_ "github.com/cznic/ql/driver"
-	"github.com/golang-migrate/migrate/v3"
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	_ "github.com/golang-migrate/migrate/v3/source/file"
+	"github.com/golang-migrate/migrate/v4"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
+	_ "github.com/golang-migrate/migrate/v4/source/file"
 )
 
 func Test(t *testing.T) {
diff --git a/database/redshift/redshift.go b/database/redshift/redshift.go
@@ -3,8 +3,8 @@ package redshift
 import (
 	"net/url"
 
-	"github.com/golang-migrate/migrate/v3/database"
-	"github.com/golang-migrate/migrate/v3/database/postgres"
+	"github.com/golang-migrate/migrate/v4/database"
+	"github.com/golang-migrate/migrate/v4/database/postgres"
 )
 
 // init registers the driver under the name 'redshift'
diff --git a/database/spanner/spanner.go b/database/spanner/spanner.go
@@ -14,8 +14,8 @@ import (
 	"cloud.google.com/go/spanner"
 	sdb "cloud.google.com/go/spanner/admin/database/apiv1"
 
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
 
 	"google.golang.org/api/iterator"
 	adminpb "google.golang.org/genproto/googleapis/spanner/admin/database/v1"
diff --git a/database/spanner/spanner_test.go b/database/spanner/spanner_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
 )
 
 func Test(t *testing.T) {
diff --git a/database/sqlite3/sqlite3.go b/database/sqlite3/sqlite3.go
@@ -3,8 +3,8 @@ package sqlite3
 import (
 	"database/sql"
 	"fmt"
-	"github.com/golang-migrate/migrate/v3"
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/golang-migrate/migrate/v4/database"
 	_ "github.com/mattn/go-sqlite3"
 	"io"
 	"io/ioutil"
diff --git a/database/sqlite3/sqlite3_test.go b/database/sqlite3/sqlite3_test.go
@@ -3,9 +3,9 @@ package sqlite3
 import (
 	"database/sql"
 	"fmt"
-	"github.com/golang-migrate/migrate/v3"
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
-	_ "github.com/golang-migrate/migrate/v3/source/file"
+	"github.com/golang-migrate/migrate/v4"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
+	_ "github.com/golang-migrate/migrate/v4/source/file"
 	_ "github.com/mattn/go-sqlite3"
 	"io/ioutil"
 	"os"
diff --git a/database/stub/stub.go b/database/stub/stub.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"reflect"
 
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4/database"
 )
 
 func init() {
diff --git a/database/stub/stub_test.go b/database/stub/stub_test.go
@@ -3,7 +3,7 @@ package stub
 import (
 	"testing"
 
-	dt "github.com/golang-migrate/migrate/v3/database/testing"
+	dt "github.com/golang-migrate/migrate/v4/database/testing"
 )
 
 func Test(t *testing.T) {
diff --git a/database/testing/testing.go b/database/testing/testing.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang-migrate/migrate/v3/database"
+	"github.com/golang-migrate/migrate/v4/database"
 )
 
 // Test runs tests against database implementations.
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/golang-migrate/migrate/v3
+module github.com/golang-migrate/migrate/v4
 
 require (
 	cloud.google.com/go v0.27.0
diff --git a/migrate.go b/migrate.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang-migrate/migrate/v3/database"
-	"github.com/golang-migrate/migrate/v3/source"
+	"github.com/golang-migrate/migrate/v4/database"
+	"github.com/golang-migrate/migrate/v4/source"
 )
 
 // DefaultPrefetchMigrations sets the number of migrations to pre-read
diff --git a/migrate_test.go b/migrate_test.go
diff --git a/source/aws_s3/s3.go b/source/aws_s3/s3.go
diff --git a/source/aws_s3/s3_test.go b/source/aws_s3/s3_test.go
diff --git a/source/file/file.go b/source/file/file.go
diff --git a/source/file/file_test.go b/source/file/file_test.go
diff --git a/source/github/github.go b/source/github/github.go
diff --git a/source/github/github_test.go b/source/github/github_test.go
diff --git a/source/go_bindata/README.md b/source/go_bindata/README.md
diff --git a/source/go_bindata/go-bindata.go b/source/go_bindata/go-bindata.go
diff --git a/source/go_bindata/go-bindata_test.go b/source/go_bindata/go-bindata_test.go
diff --git a/source/godoc_vfs/vfs.go b/source/godoc_vfs/vfs.go
diff --git a/source/godoc_vfs/vfs_example_test.go b/source/godoc_vfs/vfs_example_test.go
diff --git a/source/godoc_vfs/vfs_test.go b/source/godoc_vfs/vfs_test.go
diff --git a/source/google_cloud_storage/storage.go b/source/google_cloud_storage/storage.go
diff --git a/source/google_cloud_storage/storage_test.go b/source/google_cloud_storage/storage_test.go
diff --git a/source/stub/stub.go b/source/stub/stub.go
diff --git a/source/stub/stub_test.go b/source/stub/stub_test.go
diff --git a/source/testing/testing.go b/source/testing/testing.go

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`package main`
`4`	`4`
`5`	`5`	`import (`
`6`		`- _ "github.com/golang-migrate/migrate/v3/source/aws_s3"`
	`6`	`+ _ "github.com/golang-migrate/migrate/v4/source/aws_s3"`
`7`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`package main`
`4`	`4`
`5`	`5`	`import (`
`6`		`- _ "github.com/golang-migrate/migrate/v3/database/clickhouse"`
	`6`	`+ _ "github.com/golang-migrate/migrate/v4/database/clickhouse"`
`7`	`7`	`_ "github.com/kshvakov/clickhouse"`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"time"`
`12`	`12`
`13`	`13`	`"github.com/gocql/gocql"`
`14`		`- "github.com/golang-migrate/migrate/v3/database"`
	`14`	`+ "github.com/golang-migrate/migrate/v4/database"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/gocql/gocql"`
`9`	`9`
`10`		`- dt "github.com/golang-migrate/migrate/v3/database/testing"`
`11`		`- mt "github.com/golang-migrate/migrate/v3/testing"`
	`10`	`+ dt "github.com/golang-migrate/migrate/v4/database/testing"`
	`11`	`+ mt "github.com/golang-migrate/migrate/v4/testing"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var versions = []mt.Version{`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"strings"`
`10`	`10`	`"time"`
`11`	`11`
`12`		`- "github.com/golang-migrate/migrate/v3"`
`13`		`- "github.com/golang-migrate/migrate/v3/database"`
	`12`	`+ "github.com/golang-migrate/migrate/v4"`
	`13`	`+ "github.com/golang-migrate/migrate/v4/database"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`var DefaultMigrationsTable = "schema_migrations"`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ import (`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "github.com/golang-migrate/migrate/v3"`
`21`		`- "github.com/golang-migrate/migrate/v3/database"`
	`20`	`+ "github.com/golang-migrate/migrate/v4"`
	`21`	`+ "github.com/golang-migrate/migrate/v4/database"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"testing"`
`11`	`11`
`12`	`12`	`"bytes"`
`13`		`- dt "github.com/golang-migrate/migrate/v3/database/testing"`
`14`		`- mt "github.com/golang-migrate/migrate/v3/testing"`
	`13`	`+ dt "github.com/golang-migrate/migrate/v4/database/testing"`
	`14`	`+ mt "github.com/golang-migrate/migrate/v4/testing"`
`15`	`15`	`"github.com/lib/pq"`
`16`	`16`	`)`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ import (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`import (`
`23`		`- "github.com/golang-migrate/migrate/v3"`
`24`		`- "github.com/golang-migrate/migrate/v3/database"`
	`23`	`+ "github.com/golang-migrate/migrate/v4"`
	`24`	`+ "github.com/golang-migrate/migrate/v4/database"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`import (`
`16`		`- dt "github.com/golang-migrate/migrate/v3/database/testing"`
`17`		`- mt "github.com/golang-migrate/migrate/v3/testing"`
	`16`	`+ dt "github.com/golang-migrate/migrate/v4/database/testing"`
	`17`	`+ mt "github.com/golang-migrate/migrate/v4/testing"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`var versions = []mt.Version{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`	`"strconv"`
`13`	`13`	`"strings"`
`14`	`14`
`15`		`- "github.com/golang-migrate/migrate/v3"`
`16`		`- "github.com/golang-migrate/migrate/v3/database"`
	`15`	`+ "github.com/golang-migrate/migrate/v4"`
	`16`	`+ "github.com/golang-migrate/migrate/v4/database"`
`17`	`17`	`"github.com/lib/pq"`
`18`	`18`	`)`
`19`	`19`