diff --git a/beego.go b/beego.go index ffedcc68..48b4bf29 100644 --- a/beego.go +++ b/beego.go @@ -388,6 +388,9 @@ func initBeforeHttpRun() { Get("/docs", serverDocs) Get("/docs/*", serverDocs) } + + //init mime + AddAPPStartHook(initMime) } // this function is for test package init @@ -406,6 +409,4 @@ func TestBeegoInit(apppath string) { func init() { hooks = make([]hookfunc, 0) - //init mime - AddAPPStartHook(initMime) } diff --git a/migration/migration.go b/migration/migration.go index 71f8be35..6269104e 100644 --- a/migration/migration.go +++ b/migration/migration.go @@ -23,6 +23,7 @@ package migration import ( "errors" "sort" + "strconv" "strings" "time" @@ -82,11 +83,11 @@ func (m *Migration) Exec(name, status string) error { return m.addOrUpdateRecord(name, status) } -func (m *Migration) addOrUpdateRecord(status, name string) error { +func (m *Migration) addOrUpdateRecord(name, status string) error { o := orm.NewOrm() if status == "down" { status = "rollback" - p, err := o.Raw("update migrations set status = ?,rollback_statements = ? where name = ?").Prepare() + p, err := o.Raw("update migrations set status = ?, rollback_statements = ? where name = ?").Prepare() if err != nil { return nil } @@ -94,11 +95,11 @@ func (m *Migration) addOrUpdateRecord(status, name string) error { return err } else { status = "update" - p, err := o.Raw("insert into migrations(`name`,`created_at`,`statements`,`status`) values(?,?,?,?)").Prepare() + p, err := o.Raw("insert into migrations(`name`, `created_at`, `statements`, `status`) values(?,?,?,?)").Prepare() if err != nil { return err } - _, err = p.Exec(name, m.GetCreated(), strings.Join(m.sqls, "; "), status) + _, err = p.Exec(name, strconv.FormatInt(m.GetCreated(), 10), strings.Join(m.sqls, "; "), status) return err } }