Skip to content

Commit 3dc6daa

Browse files
dcrdata/db/dcrpg: Assign error from storeVers to err variable before error check (#1998)
Signed-off-by: Philemon Ukane <[email protected]>
1 parent c78b2bd commit 3dc6daa

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

db/dcrpg/upgrades.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func updateSchemaVersion(db *sql.DB, schema uint32) error {
158158
return err
159159
}
160160

161-
func updateMaintVersion(db *sql.DB, maint uint32) error {
161+
func updateMaintenanceVersion(db *sql.DB, maint uint32) error {
162162
_, err := db.Exec(internal.SetDBMaintenanceVersion, maint)
163163
return err
164164
}
@@ -321,7 +321,7 @@ func (u *Upgrader) compatVersion1Upgrades(current, target DatabaseVersion) (bool
321321
}
322322
}
323323
current.maint++
324-
if err = updateMaintVersion(u.db, current.maint); err != nil {
324+
if err = updateMaintenanceVersion(u.db, current.maint); err != nil {
325325
return false, fmt.Errorf("failed to update maintenance version: %v", err)
326326
}
327327
fallthrough
@@ -338,7 +338,7 @@ func (u *Upgrader) compatVersion1Upgrades(current, target DatabaseVersion) (bool
338338
}
339339
current.schema++
340340
current.maint = 0
341-
if storeVers(u.db, &current); err != nil {
341+
if err = storeVers(u.db, &current); err != nil {
342342
return false, err
343343
}
344344

@@ -351,7 +351,7 @@ func (u *Upgrader) compatVersion1Upgrades(current, target DatabaseVersion) (bool
351351
}
352352
current.schema++
353353
current.maint = 0
354-
if storeVers(u.db, &current); err != nil {
354+
if err = storeVers(u.db, &current); err != nil {
355355
return false, err
356356
}
357357

@@ -364,7 +364,7 @@ func (u *Upgrader) compatVersion1Upgrades(current, target DatabaseVersion) (bool
364364
}
365365
current.schema++
366366
current.maint = 0
367-
if storeVers(u.db, &current); err != nil {
367+
if err = storeVers(u.db, &current); err != nil {
368368
return false, err
369369
}
370370

@@ -377,7 +377,7 @@ func (u *Upgrader) compatVersion1Upgrades(current, target DatabaseVersion) (bool
377377
}
378378
current.schema++
379379
current.maint = 0
380-
if storeVers(u.db, &current); err != nil {
380+
if err = storeVers(u.db, &current); err != nil {
381381
return false, err
382382
}
383383

@@ -390,7 +390,7 @@ func (u *Upgrader) compatVersion1Upgrades(current, target DatabaseVersion) (bool
390390
}
391391
current.schema++
392392
current.maint = 0
393-
if storeVers(u.db, &current); err != nil {
393+
if err = storeVers(u.db, &current); err != nil {
394394
return false, err
395395
}
396396

@@ -403,7 +403,7 @@ func (u *Upgrader) compatVersion1Upgrades(current, target DatabaseVersion) (bool
403403
}
404404
current.schema++
405405
current.maint = 0
406-
if storeVers(u.db, &current); err != nil {
406+
if err = storeVers(u.db, &current); err != nil {
407407
return false, err
408408
}
409409

@@ -427,7 +427,7 @@ func storeVers(db *sql.DB, dbVer *DatabaseVersion) error {
427427
if err != nil {
428428
return fmt.Errorf("failed to update schema version: %w", err)
429429
}
430-
err = updateMaintVersion(db, dbVer.maint)
430+
err = updateMaintenanceVersion(db, dbVer.maint)
431431
return fmt.Errorf("failed to update maintenance version: %w", err)
432432
}
433433

0 commit comments

Comments
 (0)