Fix all linter errors.

Author: peterldowns

bindata_test.go

@@ -11,7 +11,7 @@ import (
 func bindata_read(data []byte, name string) ([]byte, error) {
 	gz, err := gzip.NewReader(bytes.NewBuffer(data))
 	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("Read %q: %w", name, err)
 	}
 
 	var buf bytes.Buffer
@@ -21,7 +21,7 @@ func bindata_read(data []byte, name string) ([]byte, error) {
 	}
 
 	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
+		return nil, fmt.Errorf("Read %q: %w", name, err)
 	}
 
 	return buf.Bytes(), nil
@@ -68,7 +68,7 @@ func test_migrations_2_record_sql() ([]byte, error) {
 // It returns an error if the asset could not be found or
 // could not be loaded.
 func Asset(name string) ([]byte, error) {
-	canonicalName := strings.Replace(name, "\\", "/", -1)
+	canonicalName := strings.ReplaceAll(name, "\\", "/")
 	if f, ok := _bindata[canonicalName]; ok {
 		return f()
 	}
@@ -94,19 +94,21 @@ var _bindata = map[string]func() ([]byte, error){
 // directory embedded in the file by go-bindata.
 // For example if you run go-bindata on data/... and data contains the
 // following hierarchy:
-//     data/
-//       foo.txt
-//       img/
-//         a.png
-//         b.png
+//
+//	data/
+//	  foo.txt
+//	  img/
+//	    a.png
+//	    b.png
+//
 // then AssetDir("data") would return []string{"foo.txt", "img"}
 // AssetDir("data/img") would return []string{"a.png", "b.png"}
 // AssetDir("foo.txt") and AssetDir("notexist") would return an error
 // AssetDir("") will return []string{"data"}.
 func AssetDir(name string) ([]string, error) {
 	node := _bintree
 	if len(name) != 0 {
-		canonicalName := strings.Replace(name, "\\", "/", -1)
+		canonicalName := strings.ReplaceAll(name, "\\", "/")
 		pathList := strings.Split(canonicalName, "/")
 		for _, p := range pathList {
 			node = node.Children[p]
@@ -131,8 +133,8 @@ type _bintree_t struct {
 }
 
 var _bintree = &_bintree_t{nil, map[string]*_bintree_t{
-	"test-migrations": &_bintree_t{nil, map[string]*_bintree_t{
-		"1_initial.sql": &_bintree_t{test_migrations_1_initial_sql, map[string]*_bintree_t{}},
-		"2_record.sql":  &_bintree_t{test_migrations_2_record_sql, map[string]*_bintree_t{}},
+	"test-migrations": {nil, map[string]*_bintree_t{
+		"1_initial.sql": {test_migrations_1_initial_sql, map[string]*_bintree_t{}},
+		"2_record.sql":  {test_migrations_2_record_sql, map[string]*_bintree_t{}},
 	}},
 }}

doc.go

@@ -1,24 +1,23 @@
 /*
-
 SQL Schema migration tool for Go.
 
 Key features:
 
-	* Usable as a CLI tool or as a library
-	* Supports SQLite, PostgreSQL, MySQL, MSSQL and Oracle databases (through gorp)
-	* Can embed migrations into your application
-	* Migrations are defined with SQL for full flexibility
-	* Atomic migrations
-	* Up/down migrations to allow rollback
-	* Supports multiple database types in one project
+  - Usable as a CLI tool or as a library
+  - Supports SQLite, PostgreSQL, MySQL, MSSQL and Oracle databases (through gorp)
+  - Can embed migrations into your application
+  - Migrations are defined with SQL for full flexibility
+  - Atomic migrations
+  - Up/down migrations to allow rollback
+  - Supports multiple database types in one project
 
-Installation
+# Installation
 
 To install the library and command line program, use the following:
 
 	go get -v github.com/rubenv/sql-migrate/...
 
-Command-line tool
+# Command-line tool
 
 The main command is called sql-migrate.
 
@@ -77,7 +76,7 @@ Use the status command to see the state of the applied migrations:
 	| 2_record.sql  | no                                      |
 	+---------------+-----------------------------------------+
 
-MySQL Caveat
+# MySQL Caveat
 
 If you are using MySQL, you must append ?parseTime=true to the datasource configuration. For example:
 
@@ -89,7 +88,7 @@ If you are using MySQL, you must append ?parseTime=true to the datasource config
 
 See https://github.com/go-sql-driver/mysql#parsetime for more information.
 
-Library
+# Library
 
 Import sql-migrate into your application:
 
@@ -137,7 +136,7 @@ Note that n can be greater than 0 even if there is an error: any migration that
 
 The full set of capabilities can be found in the API docs below.
 
-Writing migrations
+# Writing migrations
 
 Migrations are defined in SQL files, which contain a set of SQL statements. Special comments are used to distinguish up and down migrations.
 
@@ -183,7 +182,7 @@ Normally each migration is run within a transaction in order to guarantee that i
 	-- +migrate Down
 	DROP INDEX people_unique_id_idx;
 
-Embedding migrations with packr
+# Embedding migrations with packr
 
 If you like your Go applications self-contained (that is: a single binary): use packr (https://github.com/gobuffalo/packr) to embed the migration files.
 
@@ -202,7 +201,7 @@ If you already have a box and would like to use a subdirectory:
 		Dir: "./migrations",
 	}
 
-Embedding migrations with bindata
+# Embedding migrations with bindata
 
 As an alternative, but slightly less maintained, you can use bindata (https://github.com/shuLhan/go-bindata) to embed the migration files.
 
@@ -226,7 +225,7 @@ Both Asset and AssetDir are functions provided by bindata.
 
 Then proceed as usual.
 
-Extending
+# Extending
 
 Adding a new migration source means implementing MigrationSource.
 

migrate.go

@@ -183,15 +183,15 @@ type OracleDialect struct {
 	gorp.OracleDialect
 }
 
-func (d OracleDialect) IfTableNotExists(command, schema, table string) string {
+func (OracleDialect) IfTableNotExists(command, _, _ string) string {
 	return command
 }
 
-func (d OracleDialect) IfSchemaNotExists(command, schema string) string {
+func (OracleDialect) IfSchemaNotExists(command, _ string) string {
 	return command
 }
 
-func (d OracleDialect) IfTableExists(command, schema, table string) string {
+func (OracleDialect) IfTableExists(command, _, _ string) string {
 	return command
 }
 
@@ -287,13 +287,13 @@ func migrationFromFile(dir http.FileSystem, root string, info os.FileInfo) (*Mig
 	path := path.Join(root, info.Name())
 	file, err := dir.Open(path)
 	if err != nil {
-		return nil, fmt.Errorf("Error while opening %s: %s", info.Name(), err)
+		return nil, fmt.Errorf("Error while opening %s: %w", info.Name(), err)
 	}
 	defer func() { _ = file.Close() }()
 
 	migration, err := ParseMigration(info.Name(), file)
 	if err != nil {
-		return nil, fmt.Errorf("Error while parsing %s: %s", info.Name(), err)
+		return nil, fmt.Errorf("Error while parsing %s: %w", info.Name(), err)
 	}
 	return migration, nil
 }
@@ -407,7 +407,7 @@ func ParseMigration(id string, r io.ReadSeeker) (*Migration, error) {
 
 	parsed, err := sqlparse.ParseMigration(r)
 	if err != nil {
-		return nil, fmt.Errorf("Error parsing migration (%s): %s", id, err)
+		return nil, fmt.Errorf("Error parsing migration (%s): %w", id, err)
 	}
 
 	m.Up = parsed.UpStatements
@@ -477,7 +477,7 @@ func (ms MigrationSet) ExecVersion(db *sql.DB, dialect string, m MigrationSource
 }
 
 // Applies the planned migrations and returns the number of applied migrations.
-func (ms MigrationSet) applyMigrations(dir MigrationDirection, migrations []*PlannedMigration, dbMap *gorp.DbMap) (int, error) {
+func (MigrationSet) applyMigrations(dir MigrationDirection, migrations []*PlannedMigration, dbMap *gorp.DbMap) (int, error) {
 	applied := 0
 	for _, migration := range migrations {
 		var executor SqlExecutor
@@ -645,7 +645,6 @@ func (ms MigrationSet) planMigrationCommon(db *sql.DB, dialect string, m Migrati
 		toApplyCount = max
 	}
 	for _, v := range toApply[0:toApplyCount] {
-
 		if dir == Up {
 			result = append(result, &PlannedMigration{
 				Migration:          v,
@@ -715,7 +714,7 @@ func SkipMax(db *sql.DB, dialect string, m MigrationSource, dir MigrationDirecti
 
 // Filter a slice of migrations into ones that should be applied.
 func ToApply(migrations []*Migration, current string, direction MigrationDirection) []*Migration {
-	var index = -1
+	index := -1
 	if current != "" {
 		for index < len(migrations)-1 {
 			index++
@@ -804,16 +803,14 @@ func (ms MigrationSet) getMigrationDbMap(db *sql.DB, dialect string) (*gorp.DbMa
 
 Make sure that the parseTime option is supplied to your database connection.
 Check https://github.com/go-sql-driver/mysql#parsetime for more info.`)
-			} else {
-				return nil, err
 			}
+			return nil, err
 		}
 	}
 
 	// Create migration database map
 	dbMap := &gorp.DbMap{Db: db, Dialect: d}
 	table := dbMap.AddTableWithNameAndSchema(MigrationRecord{}, ms.SchemaName, ms.getTableName()).SetKeys(false, "Id")
-	//dbMap.TraceOn("", log.New(os.Stdout, "migrate: ", log.Lmicroseconds))
 
 	if dialect == "oci8" || dialect == "godror" {
 		table.ColMap("Id").SetMaxSize(4000)

migrate_test.go

@@ -502,7 +502,7 @@ func (s *SqliteMigrateSuite) TestPlanMigrationWithHoles(c *C) {
 	c.Assert(plannedMigrations[2].Queries[0], Equals, down)
 }
 
-func (s *SqliteMigrateSuite) TestLess(c *C) {
+func (*SqliteMigrateSuite) TestLess(c *C) {
 	c.Assert((Migration{Id: "1"}).Less(&Migration{Id: "2"}), Equals, true)           // 1 less than 2
 	c.Assert((Migration{Id: "2"}).Less(&Migration{Id: "1"}), Equals, false)          // 2 not less than 1
 	c.Assert((Migration{Id: "1"}).Less(&Migration{Id: "a"}), Equals, true)           // 1 less than a
@@ -520,7 +520,6 @@ func (s *SqliteMigrateSuite) TestLess(c *C) {
 	// 20160126_1200 not less than 20160126_1100
 	c.Assert((Migration{Id: "20160126_1200"}).
 		Less(&Migration{Id: "20160126_1100"}), Equals, false)
-
 }
 
 func (s *SqliteMigrateSuite) TestPlanMigrationWithUnknownDatabaseMigrationApplied(c *C) {
@@ -663,7 +662,7 @@ func (s *SqliteMigrateSuite) TestExecWithUnknownMigrationInDatabase(c *C) {
 	c.Assert(n, Equals, 2)
 
 	// Then create a new migration source with one of the migrations missing
-	var newSqliteMigrations = []*Migration{
+	newSqliteMigrations := []*Migration{
 		{
 			Id:   "124_other",
 			Up:   []string{"ALTER TABLE people ADD COLUMN middle_name text"},
@@ -742,7 +741,7 @@ func (s *SqliteMigrateSuite) TestRunMigrationObjOtherTable(c *C) {
 	c.Assert(n, Equals, 0)
 }
 
-func (s *SqliteMigrateSuite) TestSetDisableCreateTable(c *C) {
+func (*SqliteMigrateSuite) TestSetDisableCreateTable(c *C) {
 	c.Assert(migSet.DisableCreateTable, Equals, false)
 
 	SetDisableCreateTable(true)

sort_test.go

@@ -10,16 +10,16 @@ type SortSuite struct{}
 
 var _ = Suite(&SortSuite{})
 
-func (s *SortSuite) TestSortMigrations(c *C) {
-	var migrations = byId([]*Migration{
-		&Migration{Id: "10_abc", Up: nil, Down: nil},
-		&Migration{Id: "120_cde", Up: nil, Down: nil},
-		&Migration{Id: "1_abc", Up: nil, Down: nil},
-		&Migration{Id: "efg", Up: nil, Down: nil},
-		&Migration{Id: "2_cde", Up: nil, Down: nil},
-		&Migration{Id: "35_cde", Up: nil, Down: nil},
-		&Migration{Id: "3_efg", Up: nil, Down: nil},
-		&Migration{Id: "4_abc", Up: nil, Down: nil},
+func (*SortSuite) TestSortMigrations(c *C) {
+	migrations := byId([]*Migration{
+		{Id: "10_abc", Up: nil, Down: nil},
+		{Id: "120_cde", Up: nil, Down: nil},
+		{Id: "1_abc", Up: nil, Down: nil},
+		{Id: "efg", Up: nil, Down: nil},
+		{Id: "2_cde", Up: nil, Down: nil},
+		{Id: "35_cde", Up: nil, Down: nil},
+		{Id: "3_efg", Up: nil, Down: nil},
+		{Id: "4_abc", Up: nil, Down: nil},
 	})
 
 	sort.Sort(migrations)

sql-migrate/command_common.go

@@ -9,7 +9,7 @@ import (
 func ApplyMigrations(dir migrate.MigrationDirection, dryrun bool, limit int, version int64) error {
 	env, err := GetEnvironment()
 	if err != nil {
-		return fmt.Errorf("Could not parse config: %s", err)
+		return fmt.Errorf("Could not parse config: %w", err)
 	}
 
 	db, dialect, err := GetConnection(env)
@@ -32,7 +32,7 @@ func ApplyMigrations(dir migrate.MigrationDirection, dryrun bool, limit int, ver
 		}
 
 		if err != nil {
-			return fmt.Errorf("Cannot plan migration: %s", err)
+			return fmt.Errorf("Cannot plan migration: %w", err)
 		}
 
 		for _, m := range migrations {
@@ -48,7 +48,7 @@ func ApplyMigrations(dir migrate.MigrationDirection, dryrun bool, limit int, ver
 		}
 
 		if err != nil {
-			return fmt.Errorf("Migration failed: %s", err)
+			return fmt.Errorf("Migration failed: %w", err)
 		}
 
 		if n == 1 {

sql-migrate/command_down.go

@@ -7,10 +7,9 @@ import (
 	migrate "github.com/rubenv/sql-migrate"
 )
 
-type DownCommand struct {
-}
+type DownCommand struct{}
 
-func (c *DownCommand) Help() string {
+func (*DownCommand) Help() string {
 	helpText := `
 Usage: sql-migrate down [options] ...
 
@@ -28,7 +27,7 @@ Options:
 	return strings.TrimSpace(helpText)
 }
 
-func (c *DownCommand) Synopsis() string {
+func (*DownCommand) Synopsis() string {
 	return "Undo a database migration"
 }
 

sql-migrate/command_new.go

@@ -16,16 +16,11 @@ var templateContent = `
 
 -- +migrate Down
 `
-var tpl *template.Template
+var tpl = template.Must(template.New("new_migration").Parse(templateContent))
 
-func init() {
-	tpl = template.Must(template.New("new_migration").Parse(templateContent))
-}
-
-type NewCommand struct {
-}
+type NewCommand struct{}
 
-func (c *NewCommand) Help() string {
+func (*NewCommand) Help() string {
 	helpText := `
 Usage: sql-migrate new [options] name
 
@@ -40,7 +35,7 @@ Options:
 	return strings.TrimSpace(helpText)
 }
 
-func (c *NewCommand) Synopsis() string {
+func (*NewCommand) Synopsis() string {
 	return "Create a new migration"
 }
 
@@ -79,7 +74,6 @@ func CreateMigration(name string) error {
 	fileName := fmt.Sprintf("%s-%s.sql", time.Now().Format("20060102150405"), strings.TrimSpace(name))
 	pathName := path.Join(env.Dir, fileName)
 	f, err := os.Create(pathName)
-
 	if err != nil {
 		return err
 	}