34936dde by astaxie

Merge branch 'master' into develop

2 parents aa004ed9 f92ce9af
...@@ -148,6 +148,10 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex ...@@ -148,6 +148,10 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex
148 column += " " + "NOT NULL" 148 column += " " + "NOT NULL"
149 } 149 }
150 150
151 if fi.initial.String() != "" {
152 column += " DEFAULT " + fi.initial.String()
153 }
154
151 if fi.unique { 155 if fi.unique {
152 column += " " + "UNIQUE" 156 column += " " + "UNIQUE"
153 } 157 }
......
...@@ -603,7 +603,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) ...@@ -603,7 +603,7 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
603 603
604 if !findrouter { 604 if !findrouter {
605 if t, ok := p.routers[r.Method]; ok { 605 if t, ok := p.routers[r.Method]; ok {
606 runObject, p := t.Match(r.URL.Path) 606 runObject, p := t.Match(strings.ToLower(r.URL.Path))
607 if r, ok := runObject.(*controllerInfo); ok { 607 if r, ok := runObject.(*controllerInfo); ok {
608 routerInfo = r 608 routerInfo = r
609 findrouter = true 609 findrouter = true
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!