HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixed for soft delete and resolved #359 and disable warning when found non-sync tables

This commit is contained in:
Lunny Xiao 2016-02-28 13:44:18 +08:00
parent 15386d2d2f
commit 862d4e0586
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
xorm v0.5.0.0216 xorm v0.5.1.0228

18
session.go
View File

@ -1240,7 +1240,7 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{})
} }
colName = session.Engine.Quote(nm) + "." + colName colName = session.Engine.Quote(nm) + "." + colName
} }
session.Statement.ConditionStr = fmt.Sprintf("%v IS NULL OR %v = '0001-01-01 00:00:00'", session.Statement.ConditionStr = fmt.Sprintf("(%v IS NULL OR %v = '0001-01-01 00:00:00')",
colName, colName) colName, colName)
} }
} }
@ -1426,18 +1426,6 @@ func (session *Session) Ping() error {
return session.DB().Ping() return session.DB().Ping()
} }
/*
func (session *Session) isColumnExist(tableName string, col *core.Column) (bool, error) {
defer session.resetStatement()
if session.IsAutoClose {
defer session.Close()
}
return session.Engine.dialect.IsColumnExist(tableName, col)
//sqlStr, args := session.Engine.dialect.ColumnCheckSql(tableName, colName)
//results, err := session.query(sqlStr, args...)
//return len(results) > 0, err
}*/
func (engine *Engine) tableName(beanOrTableName interface{}) (string, error) { func (engine *Engine) tableName(beanOrTableName interface{}) (string, error) {
v := rValue(beanOrTableName) v := rValue(beanOrTableName)
if v.Type().Kind() == reflect.String { if v.Type().Kind() == reflect.String {
@ -1596,7 +1584,7 @@ func (session *Session) dropAll() error {
func (session *Session) getField(dataStruct *reflect.Value, key string, table *core.Table, idx int) *reflect.Value { func (session *Session) getField(dataStruct *reflect.Value, key string, table *core.Table, idx int) *reflect.Value {
var col *core.Column var col *core.Column
if col = table.GetColumnIdx(key, idx); col == nil { if col = table.GetColumnIdx(key, idx); col == nil {
session.Engine.LogWarn(fmt.Sprintf("table %v's has not column %v. %v", table.Name, key, table.Columns())) session.Engine.LogWarn(fmt.Sprintf("table %v has no column %v. %v", table.Name, key, table.ColumnsSeq()))
return nil return nil
} }
@ -4223,7 +4211,7 @@ func (s *Session) Sync2(beans ...interface{}) error {
} }
if oriTable == nil { if oriTable == nil {
engine.LogWarnf("Table %s has no struct to mapping it", table.Name) //engine.LogWarnf("Table %s has no struct to mapping it", table.Name)
continue continue
} }

2
statement.go
View File

@ -466,7 +466,7 @@ func buildConditions(engine *Engine, table *core.Table, bean interface{},
} }
if col.IsDeleted && !unscoped { // tag "deleted" is enabled if col.IsDeleted && !unscoped { // tag "deleted" is enabled
colNames = append(colNames, fmt.Sprintf("%v IS NULL or %v = '0001-01-01 00:00:00'", colNames = append(colNames, fmt.Sprintf("(%v IS NULL OR %v = '0001-01-01 00:00:00')",
colName, colName)) colName, colName))
} }

6
xorm.go
View File

@ -17,7 +17,7 @@ import (
) )
const ( const (
Version string = "0.5.0.0216" Version string = "0.5.1.0228"
) )
func regDrvsNDialects() bool { func regDrvsNDialects() bool {
@ -87,7 +87,9 @@ func NewEngine(driverName string, dataSourceName string) (*Engine, error) {
TZLocation: time.Local, TZLocation: time.Local,
} }
engine.SetLogger(NewSimpleLogger(os.Stdout)) logger := NewSimpleLogger(os.Stdout)
logger.SetLevel(core.LOG_INFO)
engine.SetLogger(logger)
engine.SetMapper(core.NewCacheMapper(new(core.SnakeMapper))) engine.SetMapper(core.NewCacheMapper(new(core.SnakeMapper)))
runtime.SetFinalizer(engine, close) runtime.SetFinalizer(engine, close)