Merge branch 'master' into update-spanner-to-1.27

dhui · web-flow · commit 2d6f0e2ab5da · 2021-12-07T14:26:59.000-08:00
diff --git a/README.md b/README.md
@@ -141,7 +141,7 @@ func main() {
     m, err := migrate.NewWithDatabaseInstance(
         "file:///migrations",
         "postgres", driver)
-    m.Steps(2)
+    m.Up() // or m.Step(2) if you want to explicitly set the number of migrations to run
 }
 ```
 
diff --git a/internal/cli/build_aws-s3.go b/internal/cli/build_aws-s3.go
@@ -1,3 +1,4 @@
+//go:build aws_s3
 // +build aws_s3
 
 package cli
diff --git a/internal/cli/build_bitbucket.go b/internal/cli/build_bitbucket.go
@@ -1,3 +1,4 @@
+//go:build bitbucket
 // +build bitbucket
 
 package cli
diff --git a/internal/cli/build_cassandra.go b/internal/cli/build_cassandra.go
@@ -1,3 +1,4 @@
+//go:build cassandra
 // +build cassandra
 
 package cli
diff --git a/internal/cli/build_clickhouse.go b/internal/cli/build_clickhouse.go
@@ -1,3 +1,4 @@
+//go:build clickhouse
 // +build clickhouse
 
 package cli
diff --git a/internal/cli/build_cockroachdb.go b/internal/cli/build_cockroachdb.go
@@ -1,3 +1,4 @@
+//go:build cockroachdb
 // +build cockroachdb
 
 package cli
diff --git a/internal/cli/build_firebird.go b/internal/cli/build_firebird.go
@@ -1,3 +1,4 @@
+//go:build firebird
 // +build firebird
 
 package cli
diff --git a/internal/cli/build_github.go b/internal/cli/build_github.go
@@ -1,3 +1,4 @@
+//go:build github
 // +build github
 
 package cli
diff --git a/internal/cli/build_github_ee.go b/internal/cli/build_github_ee.go
@@ -1,3 +1,4 @@
+//go:build github
 // +build github
 
 package cli
diff --git a/internal/cli/build_gitlab.go b/internal/cli/build_gitlab.go
@@ -1,3 +1,4 @@
+//go:build gitlab
 // +build gitlab
 
 package cli
diff --git a/internal/cli/build_go-bindata.go b/internal/cli/build_go-bindata.go
@@ -1,3 +1,4 @@
+//go:build go_bindata
 // +build go_bindata
 
 package cli
diff --git a/internal/cli/build_godoc-vfs.go b/internal/cli/build_godoc-vfs.go
@@ -1,3 +1,4 @@
+//go:build godoc_vfs
 // +build godoc_vfs
 
 package cli
diff --git a/internal/cli/build_google-cloud-storage.go b/internal/cli/build_google-cloud-storage.go
@@ -1,3 +1,4 @@
+//go:build google_cloud_storage
 // +build google_cloud_storage
 
 package cli
diff --git a/internal/cli/build_mongodb.go b/internal/cli/build_mongodb.go
@@ -1,3 +1,4 @@
+//go:build mongodb
 // +build mongodb
 
 package cli
diff --git a/internal/cli/build_mysql.go b/internal/cli/build_mysql.go
@@ -1,3 +1,4 @@
+//go:build mysql
 // +build mysql
 
 package cli
diff --git a/internal/cli/build_neo4j.go b/internal/cli/build_neo4j.go
@@ -1,3 +1,4 @@
+//go:build neo4j
 // +build neo4j
 
 package cli
diff --git a/internal/cli/build_pgx.go b/internal/cli/build_pgx.go
@@ -1,3 +1,4 @@
+//go:build pgx
 // +build pgx
 
 package cli
diff --git a/internal/cli/build_postgres.go b/internal/cli/build_postgres.go
@@ -1,3 +1,4 @@
+//go:build postgres
 // +build postgres
 
 package cli
diff --git a/internal/cli/build_ql.go b/internal/cli/build_ql.go
@@ -1,3 +1,4 @@
+//go:build ql
 // +build ql
 
 package cli
diff --git a/internal/cli/build_redshift.go b/internal/cli/build_redshift.go
@@ -1,3 +1,4 @@
+//go:build redshift
 // +build redshift
 
 package cli
diff --git a/internal/cli/build_snowflake.go b/internal/cli/build_snowflake.go
@@ -1,7 +1,8 @@
+//go:build snowflake
 // +build snowflake
 
 package cli
 
 import (
-  _ "github.com/golang-migrate/migrate/v4/database/snowflake"
+	_ "github.com/golang-migrate/migrate/v4/database/snowflake"
 )
diff --git a/internal/cli/build_spanner.go b/internal/cli/build_spanner.go
@@ -1,3 +1,4 @@
+//go:build spanner
 // +build spanner
 
 package cli
diff --git a/internal/cli/build_sqlcipher.go b/internal/cli/build_sqlcipher.go
@@ -1,3 +1,4 @@
+//go:build sqlcipher
 // +build sqlcipher
 
 package cli
diff --git a/internal/cli/build_sqlite.go b/internal/cli/build_sqlite.go
@@ -1,3 +1,4 @@
+//go:build sqlite
 // +build sqlite
 
 package cli
diff --git a/internal/cli/build_sqlite3.go b/internal/cli/build_sqlite3.go
@@ -1,3 +1,4 @@
+//go:build sqlite3
 // +build sqlite3
 
 package cli
diff --git a/internal/cli/build_sqlserver.go b/internal/cli/build_sqlserver.go
@@ -1,3 +1,4 @@
+//go:build sqlserver
 // +build sqlserver
 
 package cli
diff --git a/source/driver.go b/source/driver.go
@@ -33,7 +33,7 @@ var drivers = make(map[string]Driver)
 //   * Drivers are supposed to be read only.
 //   * Ideally don't load any contents (into memory) in Open or WithInstance.
 type Driver interface {
-	// Open returns a a new driver instance configured with parameters
+	// Open returns a new driver instance configured with parameters
 	// coming from the URL string. Migrate will call this function
 	// only once per instance.
 	Open(url string) (Driver, error)
diff --git a/source/google_cloud_storage/README.md b/source/google_cloud_storage/README.md
@@ -1,3 +1,14 @@
-# google_cloud_storage
+# Google Cloud Storage
+
+
+## Import
+
+```go
+import (
+  _ "github.com/golang-migrate/migrate/v4/source/google_cloud_storage"
+ )
+ ```
+
+## Connection String
 
 `gcs://<bucket>/<prefix>`
diff --git a/source/migration.go b/source/migration.go
@@ -66,11 +66,13 @@ func (i *Migrations) Append(m *Migration) (ok bool) {
 }
 
 func (i *Migrations) buildIndex() {
-	i.index = make(uintSlice, 0)
+	i.index = make(uintSlice, 0, len(i.migrations))
 	for version := range i.migrations {
 		i.index = append(i.index, version)
 	}
-	sort.Sort(i.index)
+	sort.Slice(i.index, func(x, y int) bool {
+		return i.index[x] < i.index[y]
+	})
 }
 
 func (i *Migrations) First() (version uint, ok bool) {
@@ -126,18 +128,6 @@ func (i *Migrations) findPos(version uint) int {
 
 type uintSlice []uint
 
-func (s uintSlice) Len() int {
-	return len(s)
-}
-
-func (s uintSlice) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (s uintSlice) Less(i, j int) bool {
-	return s[i] < s[j]
-}
-
 func (s uintSlice) Search(x uint) int {
 	return sort.Search(len(s), func(i int) bool { return s[i] >= x })
 }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func main() {`
`141`	`141`	`m, err := migrate.NewWithDatabaseInstance(`
`142`	`142`	`"file:///migrations",`
`143`	`143`	`"postgres", driver)`
`144`		`- m.Steps(2)`
	`144`	`+ m.Up() // or m.Step(2) if you want to explicitly set the number of migrations to run`
`145`	`145`	`}`
`146`	`146`	```
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build aws_s3`
`1`	`2`	`// +build aws_s3`
`2`	`3`
`3`	`4`	`package cli`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build bitbucket`
`1`	`2`	`// +build bitbucket`
`2`	`3`
`3`	`4`	`package cli`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build cassandra`
`1`	`2`	`// +build cassandra`
`2`	`3`
`3`	`4`	`package cli`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build clickhouse`
`1`	`2`	`// +build clickhouse`
`2`	`3`
`3`	`4`	`package cli`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build cockroachdb`
`1`	`2`	`// +build cockroachdb`
`2`	`3`
`3`	`4`	`package cli`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build firebird`
`1`	`2`	`// +build firebird`
`2`	`3`
`3`	`4`	`package cli`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build github`
`1`	`2`	`// +build github`
`2`	`3`
`3`	`4`	`package cli`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build gitlab`
`1`	`2`	`// +build gitlab`
`2`	`3`
`3`	`4`	`package cli`