uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes in migrator

Browse Source
This commit is contained in:
adragusin
2020-06-12 17:58:40 +03:00
committed by Dan Christian Bogos
parent 1a1fe90423
commit 2b8f5c14ee
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
migrator/derived_chargers.go
View File

@@ -224,7 +224,7 @@ func (m *Migrator) migrateV1DerivedChargers() (err error) {
if m.dryRun {
return
}
if m.removeV1DerivedChargers(); err != nil {
if err = m.removeV1DerivedChargers(); err != nil && err != utils.ErrNoMoreData {
return
}
// All done, update version wtih current one

3
migrator/stats.go
View File

@@ -240,6 +240,9 @@ func (m *Migrator) migrateStats() (err error) {
}
}
}
if m.dryRun || !migrated {
return nil
}
// call the remove function here
// All done, update version wtih current one

6
migrator/stats_it_test.go
View File

@@ -372,7 +372,7 @@ func testStsITMigrateFromv1(t *testing.T) {
t.Error("Error when setting v1Stat ", err.Error())
}
if err := stsMigrator.dmIN.DataManager().DataDB().SetVersions(engine.Versions{utils.StatS: 1}, true); err != nil {
if err := stsMigrator.dmOut.DataManager().DataDB().SetVersions(engine.Versions{utils.StatS: 1}, true); err != nil {
t.Errorf("error: <%s> when updating Stats version into dataDB", err.Error())
}
@@ -380,10 +380,10 @@ func testStsITMigrateFromv1(t *testing.T) {
t.Error(err)
}
if vrs, err := stsMigrator.dmIN.DataManager().DataDB().GetVersions(utils.StatS); err != nil {
if vrs, err := stsMigrator.dmOut.DataManager().DataDB().GetVersions(utils.StatS); err != nil {
t.Errorf("error: <%s> when updating Stats version into dataDB", err.Error())
} else if vrs[utils.StatS] != 3 {
t.Errorf("Expecting: 3, received: %+v", vrs)
t.Errorf("Expecting: 3, received: %+v", vrs[utils.StatS])
}
//from V1 to V2