fix default value

dialect_mysql.go

@@ -345,10 +345,10 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column
 
 		if colDefault != nil {
 			col.Default = *colDefault
-			if col.Default == "" {
+			col.DefaultIsEmpty = false
+		} else {
 			col.DefaultIsEmpty = true
 		}
-		}
 
 		cts := strings.Split(colType, "(")
 		colName := cts[0]
@@ -411,13 +411,11 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column
 			col.IsAutoIncrement = true
 		}
 
-		if col.SQLType.IsText() || col.SQLType.IsTime() {
+		if !col.DefaultIsEmpty {
-			if col.Default != "" {
+			if col.SQLType.IsText() {
+				col.Default = "'" + col.Default + "'"
+			} else if col.SQLType.IsTime() && col.Default != "CURRENT_TIMESTAMP" {
 				col.Default = "'" + col.Default + "'"
-			} else {
-				if col.DefaultIsEmpty {
-					col.Default = "''"
-				}
 			}
 		}
 		cols[col.Name] = col

dialect_sqlite3.go

@@ -344,9 +344,6 @@ func (db *sqlite3) GetColumns(tableName string) ([]string, map[string]*core.Colu
 				col.DefaultIsEmpty = false
 			}
 		}
-		if !col.SQLType.IsNumeric() && !col.DefaultIsEmpty {
-			col.Default = "'" + col.Default + "'"
-		}
 		cols[col.Name] = col
 		colSeq = append(colSeq, col.Name)
 	}

engine.go

@@ -907,8 +907,15 @@ func (engine *Engine) mapType(v reflect.Value) (*core.Table, error) {
 		fieldType := fieldValue.Type()
 
 		if ormTagStr != "" {
-			col = &core.Column{FieldName: t.Field(i).Name, Nullable: true, IsPrimaryKey: false,
+			col = &core.Column{
-				IsAutoIncrement: false, MapType: core.TWOSIDES, Indexes: make(map[string]int)}
+				FieldName:       t.Field(i).Name,
+				Nullable:        true,
+				IsPrimaryKey:    false,
+				IsAutoIncrement: false,
+				MapType:         core.TWOSIDES,
+				Indexes:         make(map[string]int),
+				DefaultIsEmpty:  true,
+			}
 			tags := splitTag(ormTagStr)
 
 			if len(tags) > 0 {

tag.go

@@ -125,6 +125,7 @@ func DefaultTagHandler(ctx *tagContext) error {
 		ctx.col.Default = ctx.nextTag
 		ctx.ignoreNext = true
 	}
+	ctx.col.DefaultIsEmpty = false
 	return nil
 }
 

tag_test.go

@@ -5,7 +5,6 @@
 package xorm
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 	"testing"
@@ -27,58 +26,27 @@ func TestCreatedAndUpdated(t *testing.T) {
 
 	u := new(UserCU)
 	err := testEngine.DropTables(u)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-		panic(err)
-	}
 
 	err = testEngine.CreateTables(u)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-		panic(err)
-	}
 
 	u.Name = "sss"
 	cnt, err := testEngine.Insert(u)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, 1, cnt)
-		panic(err)
-	}
-	if cnt != 1 {
-		err = errors.New("insert not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	u.Name = "xxx"
 	cnt, err = testEngine.ID(u.Id).Update(u)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, 1, cnt)
-		panic(err)
-	}
-	if cnt != 1 {
-		err = errors.New("update not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
 
 	u.Id = 0
 	u.Created = time.Now().Add(-time.Hour * 24 * 365)
 	u.Updated = u.Created
-	fmt.Println(u)
 	cnt, err = testEngine.NoAutoTime().Insert(u)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, 1, cnt)
-		panic(err)
-	}
-	if cnt != 1 {
-		err = errors.New("insert not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
 }
 
 type StrangeName struct {
@@ -90,25 +58,17 @@ func TestStrangeName(t *testing.T) {
 	assert.NoError(t, prepareEngine())
 
 	err := testEngine.DropTables(new(StrangeName))
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-	}
 
 	err = testEngine.CreateTables(new(StrangeName))
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-	}
 
 	_, err = testEngine.Insert(&StrangeName{Name: "sfsfdsfds"})
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-	}
 
 	beans := make([]StrangeName, 0)
 	err = testEngine.Find(&beans)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-	}
 }
 
 func TestCreatedUpdated(t *testing.T) {
@@ -179,29 +139,17 @@ func TestLowerCase(t *testing.T) {
 	assert.NoError(t, prepareEngine())
 
 	err := testEngine.Sync2(&Lowercase{})
-	_, err = testEngine.Where("(id) > 0").Delete(&Lowercase{})
+	assert.NoError(t, err)
-	if err != nil {
+	_, err = testEngine.Where("id > 0").Delete(&Lowercase{})
-		t.Error(err)
+	assert.NoError(t, err)
-		panic(err)
+
-	}
 	_, err = testEngine.Insert(&Lowercase{ended: 1})
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
-		panic(err)
-	}
 
 	ls := make([]Lowercase, 0)
 	err = testEngine.Find(&ls)
-	if err != nil {
+	assert.NoError(t, err)
-		t.Error(err)
+	assert.EqualValues(t, 1, len(ls))
-		panic(err)
-	}
-
-	if len(ls) != 1 {
-		err = errors.New("should be 1")
-		t.Error(err)
-		panic(err)
-	}
 }
 
 func TestAutoIncrTag(t *testing.T) {
@@ -297,6 +245,24 @@ func TestTagDefault(t *testing.T) {
 
 	assertSync(t, new(DefaultStruct))
 
+	tables, err := testEngine.DBMetas()
+	assert.NoError(t, err)
+
+	var defaultVal string
+	var isDefaultExist bool
+	tableName := testEngine.GetColumnMapper().Obj2Table("DefaultStruct")
+	for _, table := range tables {
+		if table.Name == tableName {
+			col := table.GetColumn("age")
+			assert.NotNil(t, col)
+			defaultVal = col.Default
+			isDefaultExist = !col.DefaultIsEmpty
+			break
+		}
+	}
+	assert.True(t, isDefaultExist)
+	assert.EqualValues(t, "10", defaultVal)
+
 	cnt, err := testEngine.Omit("age").Insert(&DefaultStruct{
 		Name: "test",
 		Age:  20,
@@ -312,6 +278,122 @@ func TestTagDefault(t *testing.T) {
 	assert.EqualValues(t, "test", s.Name)
 }
 
+func TestTagDefault2(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type DefaultStruct2 struct {
+		Id   int64
+		Name string
+	}
+
+	assertSync(t, new(DefaultStruct2))
+
+	tables, err := testEngine.DBMetas()
+	assert.NoError(t, err)
+
+	var defaultVal string
+	var isDefaultExist bool
+	tableName := testEngine.GetColumnMapper().Obj2Table("DefaultStruct2")
+	for _, table := range tables {
+		if table.Name == tableName {
+			col := table.GetColumn("name")
+			assert.NotNil(t, col)
+			defaultVal = col.Default
+			isDefaultExist = !col.DefaultIsEmpty
+			break
+		}
+	}
+	assert.False(t, isDefaultExist, fmt.Sprintf("default value is --%v--", defaultVal))
+	assert.EqualValues(t, "", defaultVal)
+}
+
+func TestTagDefault3(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type DefaultStruct3 struct {
+		Id   int64
+		Name string `xorm:"default('myname')"`
+	}
+
+	assertSync(t, new(DefaultStruct3))
+
+	tables, err := testEngine.DBMetas()
+	assert.NoError(t, err)
+
+	var defaultVal string
+	var isDefaultExist bool
+	tableName := testEngine.GetColumnMapper().Obj2Table("DefaultStruct3")
+	for _, table := range tables {
+		if table.Name == tableName {
+			col := table.GetColumn("name")
+			assert.NotNil(t, col)
+			defaultVal = col.Default
+			isDefaultExist = !col.DefaultIsEmpty
+			break
+		}
+	}
+	assert.True(t, isDefaultExist)
+	assert.EqualValues(t, "'myname'", defaultVal)
+}
+
+func TestTagDefault4(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type DefaultStruct4 struct {
+		Id      int64
+		Created time.Time `xorm:"default(CURRENT_TIMESTAMP)"`
+	}
+
+	assertSync(t, new(DefaultStruct4))
+
+	tables, err := testEngine.DBMetas()
+	assert.NoError(t, err)
+
+	var defaultVal string
+	var isDefaultExist bool
+	tableName := testEngine.GetColumnMapper().Obj2Table("DefaultStruct4")
+	for _, table := range tables {
+		if table.Name == tableName {
+			col := table.GetColumn("created")
+			assert.NotNil(t, col)
+			defaultVal = col.Default
+			isDefaultExist = !col.DefaultIsEmpty
+			break
+		}
+	}
+	assert.True(t, isDefaultExist)
+	assert.EqualValues(t, "CURRENT_TIMESTAMP", defaultVal)
+}
+
+func TestTagDefault5(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type DefaultStruct4 struct {
+		Id      int64
+		Created time.Time `xorm:"default('2006-01-02 15:04:05')"`
+	}
+
+	assertSync(t, new(DefaultStruct4))
+
+	tables, err := testEngine.DBMetas()
+	assert.NoError(t, err)
+
+	var defaultVal string
+	var isDefaultExist bool
+	tableName := testEngine.GetColumnMapper().Obj2Table("DefaultStruct4")
+	for _, table := range tables {
+		if table.Name == tableName {
+			col := table.GetColumn("created")
+			assert.NotNil(t, col)
+			defaultVal = col.Default
+			isDefaultExist = !col.DefaultIsEmpty
+			break
+		}
+	}
+	assert.True(t, isDefaultExist)
+	assert.EqualValues(t, "'2006-01-02 15:04:05'", defaultVal)
+}
+
 func TestTagsDirection(t *testing.T) {
 	assert.NoError(t, prepareEngine())