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

use old drop table interface

This commit is contained in:
Lunny Xiao 2015-03-12 18:03:52 +08:00
parent 53da67f171
commit a068aadd27
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine.go
View File

@ -1225,8 +1225,9 @@ func (engine *Engine) CreateTables(beans ...interface{}) error {
func (engine *Engine) DropTables(beans ...interface{}) error { func (engine *Engine) DropTables(beans ...interface{}) error {
session := engine.NewSession() session := engine.NewSession()
err := session.Begin()
defer session.Close() defer session.Close()
err := session.Begin()
if err != nil { if err != nil {
return err return err
} }

16
session.go
View File

@ -570,7 +570,7 @@ func (session *Session) DropTable(bean interface{}) error {
} }
t := reflect.Indirect(reflect.ValueOf(bean)).Type() t := reflect.Indirect(reflect.ValueOf(bean)).Type()
defer session.resetStatement()
if t.Kind() == reflect.String { if t.Kind() == reflect.String {
session.Statement.AltTableName = bean.(string) session.Statement.AltTableName = bean.(string)
} else if t.Kind() == reflect.Struct { } else if t.Kind() == reflect.Struct {
@ -579,10 +579,10 @@ func (session *Session) DropTable(bean interface{}) error {
return errors.New("Unsupported type") return errors.New("Unsupported type")
} }
return session.Engine.Dialect().MustDropTable(session.Statement.TableName()) //return session.Engine.Dialect().MustDropTable(session.Statement.TableName())
/*sqlStr := session.Statement.genDropSQL() sqlStr := session.Engine.Dialect().DropTableSql(session.Statement.TableName())
_, err := session.exec(sqlStr) _, err := session.exec(sqlStr)
return err*/ return err
} }
func (statement *Statement) JoinColumns(cols []*core.Column) string { func (statement *Statement) JoinColumns(cols []*core.Column) string {
@ -1688,14 +1688,12 @@ func (session *Session) _row2Bean(rows *core.Rows, fields []string, fieldsCount
z, _ := t.Zone() z, _ := t.Zone()
if len(z) == 0 || t.Year() == 0 { // !nashtsai! HACK tmp work around for lib/pq doesn't properly time with location if len(z) == 0 || t.Year() == 0 { // !nashtsai! HACK tmp work around for lib/pq doesn't properly time with location
session.Engine.LogDebug("empty zone key[%v] : %v | zone: %v | location: %+v\n", key, t, z, *t.Location()) session.Engine.LogDebug("empty zone key[%v] : %v | zone: %v | location: %+v\n", key, t, z, *t.Location())
tt := time.Date(t.Year(), t.Month(), t.Day(), t.Hour(), t = time.Date(t.Year(), t.Month(), t.Day(), t.Hour(),
t.Minute(), t.Second(), t.Nanosecond(), time.Local) t.Minute(), t.Second(), t.Nanosecond(), time.Local)
vv = reflect.ValueOf(tt)
} }
// !nashtsai! convert to engine location // !nashtsai! convert to engine location
t = vv.Convert(core.TimeType).Interface().(time.Time).In(session.Engine.TZLocation) t = t.In(session.Engine.TZLocation)
vv = reflect.ValueOf(t) fieldValue.Set(reflect.ValueOf(t).Convert(fieldType))
fieldValue.Set(vv)
// t = fieldValue.Interface().(time.Time) // t = fieldValue.Interface().(time.Time)
// z, _ = t.Zone() // z, _ = t.Zone()