ef79a2b4 by slene

fix #440

1 parent 20cfece1
...@@ -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,11 +222,15 @@ func (t *dbTables) parseExprs(mi *modelInfo, exprs []string) (index, name string ...@@ -221,11 +222,15 @@ func (t *dbTables) parseExprs(mi *modelInfo, exprs []string) (index, name string
221 inner = false 222 inner = false
222 } 223 }
223 224
225 if num == i && t.skipEnd {
226 } else {
224 jt, _ := t.add(names, mmi, fi, inner) 227 jt, _ := t.add(names, mmi, fi, inner)
225 jt.jtl = jtl 228 jt.jtl = jtl
226 jtl = jt 229 jtl = jt
227 } 230 }
228 231
232 }
233
229 if num == i { 234 if num == i {
230 if i == 0 || jtl == nil { 235 if i == 0 || jtl == nil {
231 index = "T0" 236 index = "T0"
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!