fix #440
Showing
2 changed files
with
10 additions
and
3 deletions
| ... | @@ -461,6 +461,8 @@ func (d *dbBase) deleteRels(q dbQuerier, mi *modelInfo, args []interface{}, tz * | ... | @@ -461,6 +461,8 @@ func (d *dbBase) deleteRels(q dbQuerier, mi *modelInfo, args []interface{}, tz * |
| 461 | 461 | ||
| 462 | func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condition, tz *time.Location) (int64, error) { | 462 | func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condition, tz *time.Location) (int64, error) { |
| 463 | tables := newDbTables(mi, d.ins) | 463 | tables := newDbTables(mi, d.ins) |
| 464 | tables.skipEnd = true | ||
| 465 | |||
| 464 | if qs != nil { | 466 | if qs != nil { |
| 465 | tables.parseRelated(qs.related, qs.relDepth) | 467 | tables.parseRelated(qs.related, qs.relDepth) |
| 466 | } | 468 | } | ... | ... |
| ... | @@ -23,6 +23,7 @@ type dbTables struct { | ... | @@ -23,6 +23,7 @@ type dbTables struct { |
| 23 | tables []*dbTable | 23 | tables []*dbTable |
| 24 | mi *modelInfo | 24 | mi *modelInfo |
| 25 | base dbBaser | 25 | base dbBaser |
| 26 | skipEnd bool | ||
| 26 | } | 27 | } |
| 27 | 28 | ||
| 28 | func (t *dbTables) set(names []string, mi *modelInfo, fi *fieldInfo, inner bool) *dbTable { | 29 | func (t *dbTables) set(names []string, mi *modelInfo, fi *fieldInfo, inner bool) *dbTable { |
| ... | @@ -221,9 +222,13 @@ func (t *dbTables) parseExprs(mi *modelInfo, exprs []string) (index, name string | ... | @@ -221,9 +222,13 @@ func (t *dbTables) parseExprs(mi *modelInfo, exprs []string) (index, name string |
| 221 | inner = false | 222 | inner = false |
| 222 | } | 223 | } |
| 223 | 224 | ||
| 224 | jt, _ := t.add(names, mmi, fi, inner) | 225 | if num == i && t.skipEnd { |
| 225 | jt.jtl = jtl | 226 | } else { |
| 226 | jtl = jt | 227 | jt, _ := t.add(names, mmi, fi, inner) |
| 228 | jt.jtl = jtl | ||
| 229 | jtl = jt | ||
| 230 | } | ||
| 231 | |||
| 227 | } | 232 | } |
| 228 | 233 | ||
| 229 | if num == i { | 234 | if num == i { | ... | ... |
-
Please register or sign in to post a comment