Take version for sessions_costs from storDB

This commit is contained in:
TeoV
2018-02-06 09:58:15 +02:00
committed by Dan Christian Bogos
parent ea3e15140f
commit 9cab867f73
2 changed files with 10 additions and 11 deletions

View File

@@ -1118,25 +1118,25 @@ func testMigratorSessionsCosts(t *testing.T) {
case Move:
currentVersion := engine.CurrentStorDBVersions()
currentVersion[utils.SessionsCosts] = 1
err := mig.dmOut.DataDB().SetVersions(currentVersion, false)
err := mig.OutStorDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for SessionsCosts ", err.Error())
}
err, _ = mig.Migrate([]string{utils.MetaSessionsCosts})
if err == nil {
t.Error("Expecting error , received: nil ")
if err.Error() != "Wrong version. Please use <cgr-migrator -migrate=*set_versions>" {
t.Error("Expecting error , received: %+v ", err)
}
if vrs, err := mig.dmOut.DataDB().GetVersions(utils.SessionsCosts); err != nil {
if vrs, err := mig.OutStorDB().GetVersions(utils.SessionsCosts); err != nil {
t.Error(err)
} else if vrs[utils.SessionsCosts] != 1 {
t.Errorf("Expecting: 1, received: %+v", vrs[utils.SessionsCosts])
}
currentVersion = engine.CurrentStorDBVersions()
err = mig.dmOut.DataDB().SetVersions(currentVersion, false)
err = mig.OutStorDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for SessionsCosts ", err.Error())
}
if vrs, err := mig.dmOut.DataDB().GetVersions(utils.SessionsCosts); err != nil {
if vrs, err := mig.OutStorDB().GetVersions(utils.SessionsCosts); err != nil {
t.Error(err)
} else if vrs[utils.SessionsCosts] != 2 {
t.Errorf("Expecting: 2, received: %+v", vrs[utils.SessionsCosts])

View File

@@ -28,21 +28,20 @@ import (
func (m *Migrator) migrateSessionsCosts() (err error) {
var vrs engine.Versions
vrs, err = m.dmOut.DataDB().GetVersions(utils.TBLVersions)
vrs, err = m.OutStorDB().GetVersions(utils.TBLVersions)
if err != nil {
return utils.NewCGRError(utils.Migrator,
utils.ServerErrorCaps,
err.Error(),
fmt.Sprintf("error: <%s> when querying oldDataDB for versions", err.Error()))
fmt.Sprintf("error: <%s> when querying OutStorDB for versions", err.Error()))
} else if len(vrs) == 0 {
return utils.NewCGRError(utils.Migrator,
utils.MandatoryIEMissingCaps,
utils.UndefinedVersion,
"version number is not defined for ActionTriggers model")
"version number is not defined for SessionsCosts model")
}
if vrs[utils.SessionsCosts] == 1 {
msg := "Migration needed: please backup cgrates data and run from data/storage the scripts for MySql and Postgres"
return errors.New(msg)
return errors.New("Wrong version. Please use <cgr-migrator -migrate=*set_versions>")
}
return nil
}