diff --git a/helpers/auth.go b/helpers/auth.go index 2f32c61..7ebefbf 100644 --- a/helpers/auth.go +++ b/helpers/auth.go @@ -2,7 +2,7 @@ package helpers import ( "code.google.com/p/go.crypto/bcrypt" - "github.com/coopernurse/gorp" + "github.com/go-gorp/gorp" "github.com/haruyama/golang-goji-sample/models" ) diff --git a/models/user.go b/models/user.go index 589c7f8..594e933 100644 --- a/models/user.go +++ b/models/user.go @@ -6,7 +6,7 @@ import ( "log" "code.google.com/p/go.crypto/bcrypt" - "github.com/coopernurse/gorp" + "github.com/go-gorp/gorp" _ "github.com/go-sql-driver/mysql" "github.com/golang/glog" ) @@ -48,7 +48,7 @@ func GetDbMap(user, password, hostname, port, database string) *gorp.DbMap { checkErr(err, "sql.Open failed") // construct a gorp DbMap - dbMap := &gorp.DbMap{Db: db, Dialect: gorp.MySQLDialect{"InnoDB", "UTF8MB4"}} + dbMap := &gorp.DbMap{Db: db, Dialect: gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8MB4"}} // add a table, setting the table name to 'posts' and // specifying that the Id property is an auto incrementing PK diff --git a/system/controller.go b/system/controller.go index 52ed0f6..b09e579 100644 --- a/system/controller.go +++ b/system/controller.go @@ -4,7 +4,7 @@ import ( "bytes" "html/template" - "github.com/coopernurse/gorp" + "github.com/go-gorp/gorp" "github.com/gorilla/sessions" "github.com/zenazn/goji/web" ) diff --git a/system/core.go b/system/core.go index 732ff4c..491ab72 100644 --- a/system/core.go +++ b/system/core.go @@ -11,7 +11,7 @@ import ( "crypto/sha256" - "github.com/coopernurse/gorp" + "github.com/go-gorp/gorp" "github.com/golang/glog" "github.com/gorilla/sessions" "github.com/haruyama/golang-goji-sample/models" diff --git a/system/middleware.go b/system/middleware.go index bbf0c95..7411aaf 100644 --- a/system/middleware.go +++ b/system/middleware.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/coopernurse/gorp" + "github.com/go-gorp/gorp" "github.com/go-utils/uslice" "github.com/golang/glog" "github.com/gorilla/sessions"