mirror of
https://github.com/astaxie/beego.git
synced 2024-12-23 00:00:50 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
34936dde35
@ -148,6 +148,10 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex
|
||||
column += " " + "NOT NULL"
|
||||
}
|
||||
|
||||
if fi.initial.String() != "" {
|
||||
column += " DEFAULT " + fi.initial.String()
|
||||
}
|
||||
|
||||
if fi.unique {
|
||||
column += " " + "UNIQUE"
|
||||
}
|
||||
|
@ -603,7 +603,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
|
||||
|
||||
if !findrouter {
|
||||
if t, ok := p.routers[r.Method]; ok {
|
||||
runObject, p := t.Match(r.URL.Path)
|
||||
runObject, p := t.Match(strings.ToLower(r.URL.Path))
|
||||
if r, ok := runObject.(*controllerInfo); ok {
|
||||
routerInfo = r
|
||||
findrouter = true
|
||||
|
Loading…
Reference in New Issue
Block a user