Skip to content

Commit 633afdc

Browse files
committed
Merge pull request #5 from haruyama/update_gorp_path
Update gorp path
2 parents d538043 + 3d1e317 commit 633afdc

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

helpers/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package helpers
22

33
import (
44
"code.google.com/p/go.crypto/bcrypt"
5-
"github.com/coopernurse/gorp"
5+
"github.com/go-gorp/gorp"
66
"github.com/haruyama/golang-goji-sample/models"
77
)
88

models/user.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"log"
77

88
"code.google.com/p/go.crypto/bcrypt"
9-
"github.com/coopernurse/gorp"
9+
"github.com/go-gorp/gorp"
1010
_ "github.com/go-sql-driver/mysql"
1111
"github.com/golang/glog"
1212
)
@@ -48,7 +48,7 @@ func GetDbMap(user, password, hostname, port, database string) *gorp.DbMap {
4848
checkErr(err, "sql.Open failed")
4949

5050
// construct a gorp DbMap
51-
dbMap := &gorp.DbMap{Db: db, Dialect: gorp.MySQLDialect{"InnoDB", "UTF8MB4"}}
51+
dbMap := &gorp.DbMap{Db: db, Dialect: gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8MB4"}}
5252

5353
// add a table, setting the table name to 'posts' and
5454
// specifying that the Id property is an auto incrementing PK

system/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"html/template"
66

7-
"github.com/coopernurse/gorp"
7+
"github.com/go-gorp/gorp"
88
"github.com/gorilla/sessions"
99
"github.com/zenazn/goji/web"
1010
)

system/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"crypto/sha256"
1313

14-
"github.com/coopernurse/gorp"
14+
"github.com/go-gorp/gorp"
1515
"github.com/golang/glog"
1616
"github.com/gorilla/sessions"
1717
"github.com/haruyama/golang-goji-sample/models"

system/middleware.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99
"strings"
1010

11-
"github.com/coopernurse/gorp"
11+
"github.com/go-gorp/gorp"
1212
"github.com/go-utils/uslice"
1313
"github.com/golang/glog"
1414
"github.com/gorilla/sessions"

0 commit comments

Comments
 (0)