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

bug fixed for dump

This commit is contained in:
Lunny Xiao 2017-01-18 23:08:43 +08:00
parent b1bbae3949
commit 263f9d3fa5
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine.go
View File

@ -441,19 +441,15 @@ func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.D
} }
} }
rows, err := engine.DB().Query("SELECT * FROM " + engine.Quote(table.Name)) cols := table.ColumnsSeq()
colNames := dialect.Quote(strings.Join(cols, dialect.Quote(", ")))
rows, err := engine.DB().Query("SELECT " + colNames + " FROM " + engine.Quote(table.Name))
if err != nil { if err != nil {
return err return err
} }
defer rows.Close() defer rows.Close()
cols, err := rows.Columns()
if err != nil {
return err
}
if len(cols) == 0 {
continue
}
for rows.Next() { for rows.Next() {
dest := make([]interface{}, len(cols)) dest := make([]interface{}, len(cols))
err = rows.ScanSlice(&dest) err = rows.ScanSlice(&dest)
@ -461,7 +457,7 @@ func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.D
return err return err
} }
_, err = io.WriteString(w, "INSERT INTO "+dialect.Quote(table.Name)+" ("+dialect.Quote(strings.Join(cols, dialect.Quote(", ")))+") VALUES (") _, err = io.WriteString(w, "INSERT INTO "+dialect.Quote(table.Name)+" ("+colNames+") VALUES (")
if err != nil { if err != nil {
return err return err
} }
@ -469,6 +465,10 @@ func (engine *Engine) dumpTables(tables []*core.Table, w io.Writer, tp ...core.D
var temp string var temp string
for i, d := range dest { for i, d := range dest {
col := table.GetColumn(cols[i]) col := table.GetColumn(cols[i])
if col == nil {
return errors.New("unknow column error")
}
if d == nil { if d == nil {
temp += ", NULL" temp += ", NULL"
} else if col.SQLType.IsText() || col.SQLType.IsTime() { } else if col.SQLType.IsText() || col.SQLType.IsTime() {