Merge remote-tracking branch 'remotes/upstream/develop' into fargo

# Conflicts:
#	memzipfile.go

controller_test.go

@@ -17,42 +17,48 @@ package beego
 import (
 	"fmt"
 	"github.com/astaxie/beego/context"
+	"testing"
 )
 
-func ExampleGetInt() {
+func TestGetInt(t *testing.T) {
 
 	i := &context.BeegoInput{Params: map[string]string{"age": "40"}}
 	ctx := &context.Context{Input: i}
 	ctrlr := Controller{Ctx: ctx}
 
 	val, _ := ctrlr.GetInt("age")
-	fmt.Printf("%T", val)
-	//Output: int
+
+	if (val != 40) {
+		t.Errorf("TestGetInt expect 40,get %T,%v", val, val)
+	}
 }
 
-func ExampleGetInt8() {
+func TestGetInt8(t *testing.T) {
 
 	i := &context.BeegoInput{Params: map[string]string{"age": "40"}}
 	ctx := &context.Context{Input: i}
 	ctrlr := Controller{Ctx: ctx}
 
 	val, _ := ctrlr.GetInt8("age")
-	fmt.Printf("%T", val)
+	if val != 40 {
+		t.Errorf("TestGetInt8 expect 40,get %T,%v", val, val)
+	}
 	//Output: int8
 }
 
-func ExampleGetInt16() {
+func TestGetInt16(t *testing.T) {
 
 	i := &context.BeegoInput{Params: map[string]string{"age": "40"}}
 	ctx := &context.Context{Input: i}
 	ctrlr := Controller{Ctx: ctx}
 
 	val, _ := ctrlr.GetInt16("age")
-	fmt.Printf("%T", val)
-	//Output: int16
+	if val != 40 {
+		t.Errorf("TestGetInt16 expect 40,get %T,%v", val, val)
+	}
 }
 
-func ExampleGetInt32() {
+func TestGetInt32(t *testing.T) {
 
 	i := &context.BeegoInput{Params: map[string]string{"age": "40"}}
 	ctx := &context.Context{Input: i}
@@ -60,16 +66,19 @@ func ExampleGetInt32() {
 
 	val, _ := ctrlr.GetInt32("age")
 	fmt.Printf("%T", val)
-	//Output: int32
+	if val != 40 {
+		t.Errorf("TestGetInt32 expect 40,get %T,%v", val, val)
+	}
 }
 
-func ExampleGetInt64() {
+func TestGetInt64(t *testing.T) {
 
 	i := &context.BeegoInput{Params: map[string]string{"age": "40"}}
 	ctx := &context.Context{Input: i}
 	ctrlr := Controller{Ctx: ctx}
 
 	val, _ := ctrlr.GetInt64("age")
-	fmt.Printf("%T", val)
-	//Output: int64
+	if val != 40 {
+		t.Errorf("TestGeetInt64 expect 40,get %T,%v", val, val)
+	}
 }

migration/migration.go

@@ -104,7 +104,7 @@ 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` = ?, `created_at` = ? where name = ?").Prepare()
+		p, err := o.Raw("update migrations set status = ?, rollback_statements = ?, created_at = ? where name = ?").Prepare()
 		if err != nil {
 			return nil
 		}
@@ -112,7 +112,7 @@ func (m *Migration) addOrUpdateRecord(name, status string) error {
 		return err
 	}
 	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
 	}