xorm/xorm
xorm/xorm
63
356
Fork 205
Code Issues 369 Pull Requests 16 Actions Releases 35 Activity

Don't warn when bool column default is 1 but not true #1447

Merged
lunny merged 3 commits from lunny/fix_wrong_warn into master 2019-10-02 07:04:50 +00:00
Conversation 1 Commits 3 Files Changed 2 +21 -2
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
session_schema.go
View File

@ -344,9 +344,15 @@ func (session *Session) Sync2(beans ...interface{}) error {
}
}
}
if col.Default != oriCol.Default {
engine.logger.Warnf("Table %s Column %s db default is %s, struct default is %s",
tbName, col.Name, oriCol.Default, col.Default)
if (col.SQLType.Name == core.Bool || col.SQLType.Name == core.Boolean) &&
((strings.EqualFold(col.Default, "true") && oriCol.Default == "1") ||
(strings.EqualFold(col.Default, "false") && oriCol.Default == "0")) {
} else {
engine.logger.Warnf("Table %s Column %s db default is %s, struct default is %s",
tbName, col.Name, oriCol.Default, col.Default)
}
}
if col.Nullable != oriCol.Nullable {
engine.logger.Warnf("Table %s Column %s db nullable is %v, struct nullable is %v",

13
session_schema_test.go
View File

@ -332,3 +332,16 @@ func TestSync2_2(t *testing.T) {
assert.True(t, tableNames[table.Name])
}
}
func TestSync2_Default(t *testing.T) {
type TestSync2Default struct {
Id int64
UserId int64 `xorm:"default(1)"`
IsMember bool `xorm:"default(true)"`
Name string `xorm:"default('my_name')"`
}
assert.NoError(t, prepareEngine())
assertSync(t, new(TestSync2Default))
assert.NoError(t, testEngine.Sync2(new(TestSync2Default)))
}