Skip to content

Commit 162da2a

Browse files
committed
Changed rebuild update args
1 parent ac8b145 commit 162da2a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

nested_set.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ func MoveTo(db *gorm.DB, node, to interface{}, direction MoveDirection) error {
280280

281281
// Rebuild rebuild nodes as any nestedset which in the scope
282282
// ```nestedset.Rebuild(db, &node, true)``` will rebuild [&node] as nestedset
283-
func Rebuild(db *gorm.DB, source interface{}, dirty bool) (affectedCount int, err error) {
283+
func Rebuild(db *gorm.DB, source interface{}, doUpdate bool) (affectedCount int, err error) {
284284
tx, target, err := parseNode(db, source)
285285
if err != nil {
286286
return
@@ -300,7 +300,7 @@ func Rebuild(db *gorm.DB, source interface{}, dirty bool) (affectedCount int, er
300300
for _, item := range allItems {
301301
if item.IsChanged {
302302
affectedCount += 1
303-
if !dirty {
303+
if doUpdate {
304304
err = tx.Table(target.TableName).
305305
Where(formatSQL(":id=?", target), item.ID).
306306
Updates(map[string]interface{}{

nested_set_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func TestMoveToRight(t *testing.T) {
189189

190190
func TestRebuild(t *testing.T) {
191191
initData()
192-
affectedCount, err := Rebuild(db, clothing, false)
192+
affectedCount, err := Rebuild(db, clothing, true)
193193
assert.NoError(t, err)
194194
assert.Equal(t, 0, affectedCount)
195195
reloadCategories()
@@ -215,7 +215,7 @@ func TestRebuild(t *testing.T) {
215215
reloadCategories()
216216
assertNodeEqual(t, sunDresses, 12, 123, 1, 100, dresses.ID)
217217

218-
affectedCount, err = Rebuild(db, clothing, false)
218+
affectedCount, err = Rebuild(db, clothing, true)
219219
assert.NoError(t, err)
220220
assert.Equal(t, 1, affectedCount)
221221
reloadCategories()
@@ -237,11 +237,11 @@ func TestRebuild(t *testing.T) {
237237
"ParentID": sql.NullInt64{Valid: false},
238238
}).(*Category)
239239

240-
affectedCount, err = Rebuild(db, clothing, true)
240+
affectedCount, err = Rebuild(db, clothing, false)
241241
assert.NoError(t, err)
242242
assert.Equal(t, 1, affectedCount)
243243

244-
affectedCount, err = Rebuild(db, clothing, false)
244+
affectedCount, err = Rebuild(db, clothing, true)
245245
assert.NoError(t, err)
246246
assert.Equal(t, 1, affectedCount)
247247
reloadCategories()
@@ -304,10 +304,10 @@ func TestRebuild(t *testing.T) {
304304
"UserID": 6666,
305305
}).(*Category)
306306

307-
affectedCount, err = Rebuild(db, jacksSuits, false)
307+
affectedCount, err = Rebuild(db, jacksSuits, true)
308308
assert.NoError(t, err)
309309
assert.Equal(t, 4, affectedCount)
310-
affectedCount, err = Rebuild(db, lilysHat, false)
310+
affectedCount, err = Rebuild(db, lilysHat, true)
311311
assert.NoError(t, err)
312312
assert.Equal(t, 3, affectedCount)
313313
jacksClothing, _ = findNode(db, jacksClothing.ID)

0 commit comments

Comments
 (0)