From 7c8f91ee3d93b82d4735b6e2e77b6f7f29d001a8 Mon Sep 17 00:00:00 2001 From: TeoV Date: Fri, 27 Apr 2018 11:19:59 -0400 Subject: [PATCH] Update migrator tests --- engine/storage_sql.go | 9 ++++--- engine/version.go | 2 +- migrator/migrator_it_test.go | 46 ++++++++++++++++++------------------ migrator/sessions_costs.go | 2 +- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/engine/storage_sql.go b/engine/storage_sql.go index b399e8901..7e51a60ad 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -759,9 +759,12 @@ func (self *SQLStorage) SetSMCost(smc *SMCost) error { func (self *SQLStorage) RemoveSMCost(smc *SMCost) error { tx := self.db.Begin() - - if err := tx.Where(&SessionsCostsSQL{Cgrid: smc.CGRID, - RunID: smc.RunID}).Delete(SessionsCostsSQL{}).Error; err != nil { + var rmParam *SessionsCostsSQL + if smc != nil { + rmParam = &SessionsCostsSQL{Cgrid: smc.CGRID, + RunID: smc.RunID} + } + if err := tx.Where(rmParam).Delete(SessionsCostsSQL{}).Error; err != nil { tx.Rollback() return err } diff --git a/engine/version.go b/engine/version.go index 6a471de7d..9ae76e6a9 100644 --- a/engine/version.go +++ b/engine/version.go @@ -147,7 +147,7 @@ func CurrentDataDBVersions() Versions { func CurrentStorDBVersions() Versions { return Versions{ utils.COST_DETAILS: 2, - utils.SessionsCosts: 3, + utils.SessionSCosts: 3, utils.CDRs: 2, utils.TpRatingPlans: 1, utils.TpFilters: 1, diff --git a/migrator/migrator_it_test.go b/migrator/migrator_it_test.go index fcf9d445b..5f36209e9 100644 --- a/migrator/migrator_it_test.go +++ b/migrator/migrator_it_test.go @@ -115,14 +115,14 @@ func TestMigratorITPostgresConnect(t *testing.T) { if err != nil { log.Fatal(err) } - storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, - cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding, + storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, + cfg_in.StorDBUser, cfg_in.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - oldstorDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, - cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding, + oldstorDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, + cfg_in.StorDBUser, cfg_in.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) @@ -163,14 +163,14 @@ func TestMigratorITRedisConnect(t *testing.T) { if err != nil { log.Fatal(err) } - storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, - cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding, + storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, + cfg_in.StorDBUser, cfg_in.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - oldstorDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, - cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding, + oldstorDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, + cfg_in.StorDBUser, cfg_in.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) @@ -211,14 +211,14 @@ func TestMigratorITMongoConnect(t *testing.T) { if err != nil { log.Fatal(err) } - storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, - cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding, + storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, + cfg_in.StorDBUser, cfg_in.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - oldstorDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, - cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding, + oldstorDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, + cfg_in.StorDBUser, cfg_in.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) @@ -263,14 +263,14 @@ func TestMigratorITMoveConnect(t *testing.T) { if err != nil { log.Fatal(err) } - storDB, err := engine.ConfigureStorStorage(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, - cfg_in.StorDBUser, cfg_in.StorDBPass, cfg_in.DBDataEncoding, + storDB, err := engine.ConfigureStorDB(cfg_in.StorDBType, cfg_in.StorDBHost, cfg_in.StorDBPort, cfg_in.StorDBName, + cfg_in.StorDBUser, cfg_in.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) } - oldstorDB, err := engine.ConfigureStorStorage(cfg_out.StorDBType, cfg_out.StorDBHost, cfg_out.StorDBPort, cfg_out.StorDBName, - cfg_out.StorDBUser, cfg_out.StorDBPass, cfg_out.DBDataEncoding, + oldstorDB, err := engine.ConfigureStorDB(cfg_out.StorDBType, cfg_out.StorDBHost, cfg_out.StorDBPort, cfg_out.StorDBName, + cfg_out.StorDBUser, cfg_out.StorDBPass, config.CgrConfig().StorDBMaxOpenConns, config.CgrConfig().StorDBMaxIdleConns, config.CgrConfig().StorDBConnMaxLifetime, config.CgrConfig().StorDBCDRSIndexes) if err != nil { log.Fatal(err) @@ -1121,15 +1121,15 @@ func testMigratorSessionsCosts(t *testing.T) { switch action { case utils.REDIS: currentVersion := engine.CurrentStorDBVersions() - currentVersion[utils.SessionsCosts] = 1 + currentVersion[utils.SessionSCosts] = 1 err := mig.OutStorDB().SetVersions(currentVersion, false) if err != nil { t.Error("Error when setting version for SessionsCosts ", err.Error()) } - if vrs, err := mig.OutStorDB().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]) + } else if vrs[utils.SessionSCosts] != 1 { + t.Errorf("Expecting: 1, received: %+v", vrs[utils.SessionSCosts]) } var qry string if isPostgres { @@ -1161,10 +1161,10 @@ func testMigratorSessionsCosts(t *testing.T) { t.Error(err) } err, _ = mig.Migrate([]string{utils.MetaSessionsCosts}) - if vrs, err := mig.OutStorDB().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]) + } else if vrs[utils.SessionSCosts] != 3 { + t.Errorf("Expecting: 3, received: %+v", vrs[utils.SessionSCosts]) } } } diff --git a/migrator/sessions_costs.go b/migrator/sessions_costs.go index e975c0d55..a6d96a09e 100644 --- a/migrator/sessions_costs.go +++ b/migrator/sessions_costs.go @@ -77,7 +77,7 @@ func (m *Migrator) migrateSessionSCosts() (err error) { return utils.NewCGRError(utils.Migrator, utils.ServerErrorCaps, err.Error(), - fmt.Sprintf("error: <%s> when updating SessionsCosts version into StorDB", err.Error())) + fmt.Sprintf("error: <%s> when updating SessionSCosts version into StorDB", err.Error())) } return nil }