Merge pull request #32 from vlkv/master

rubenv · rubenv · commit 51aa4cacd5b4 · 2016-05-26T11:30:19.000+02:00
FIXED "go vet ./..." error: unresolvable package for gorp.MySQLDialec…
diff --git a/migrate.go b/migrate.go
@@ -128,7 +128,7 @@ type MigrationRecord struct {
 var MigrationDialects = map[string]gorp.Dialect{
 	"sqlite3":  gorp.SqliteDialect{},
 	"postgres": gorp.PostgresDialect{},
-	"mysql":    gorp.MySQLDialect{"InnoDB", "UTF8"},
+	"mysql":    gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8"},
 	"mssql":    gorp.SqlServerDialect{},
 	"oci8":     gorp.OracleDialect{},
 }
diff --git a/sql-migrate/config.go b/sql-migrate/config.go
@@ -19,7 +19,7 @@ import (
 var dialects = map[string]gorp.Dialect{
 	"sqlite3":  gorp.SqliteDialect{},
 	"postgres": gorp.PostgresDialect{},
-	"mysql":    gorp.MySQLDialect{"InnoDB", "UTF8"},
+	"mysql":    gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8"},
 }
 
 var ConfigFile string

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ type MigrationRecord struct {`
`128`	`128`	`var MigrationDialects = map[string]gorp.Dialect{`
`129`	`129`	`"sqlite3": gorp.SqliteDialect{},`
`130`	`130`	`"postgres": gorp.PostgresDialect{},`
`131`		`- "mysql": gorp.MySQLDialect{"InnoDB", "UTF8"},`
	`131`	`+ "mysql": gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8"},`
`132`	`132`	`"mssql": gorp.SqlServerDialect{},`
`133`	`133`	`"oci8": gorp.OracleDialect{},`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`var dialects = map[string]gorp.Dialect{`
`20`	`20`	`"sqlite3": gorp.SqliteDialect{},`
`21`	`21`	`"postgres": gorp.PostgresDialect{},`
`22`		`- "mysql": gorp.MySQLDialect{"InnoDB", "UTF8"},`
	`22`	`+ "mysql": gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8"},`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`var ConfigFile string`