From f1d2bc6164d7d412510da22c7ff448a1fe0a0d9f Mon Sep 17 00:00:00 2001 From: DanB Date: Sun, 6 Oct 2013 19:18:41 +0200 Subject: [PATCH] Renaming RateSubject into RatingSubject to better reflect it's purpose --- data/storage/mysql/create_tariffplan_tables.sql | 2 +- data/tariffplans/fs_germany_prep1/Actions.csv | 2 +- data/tariffplans/prepaid1centpsec/Actions.csv | 2 +- engine/storage_sql.go | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql index de9b87bd9..6f24eb81f 100644 --- a/data/storage/mysql/create_tariffplan_tables.sql +++ b/data/storage/mysql/create_tariffplan_tables.sql @@ -120,7 +120,7 @@ CREATE TABLE `tp_actions` ( `units` DECIMAL(8,4) NOT NULL, `expiry_time` varchar(24) NOT NULL, `destination_tag` varchar(64) NOT NULL, - `rate_subject` varchar(64) NOT NULL, + `rating_subject` varchar(64) NOT NULL, `balance_weight` DECIMAL(5,2) NOT NULL, `extra_parameters` varchar(256) NOT NULL, `weight` DECIMAL(5,2) NOT NULL, diff --git a/data/tariffplans/fs_germany_prep1/Actions.csv b/data/tariffplans/fs_germany_prep1/Actions.csv index b882cd2ae..620e17566 100644 --- a/data/tariffplans/fs_germany_prep1/Actions.csv +++ b/data/tariffplans/fs_germany_prep1/Actions.csv @@ -1,2 +1,2 @@ -#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RateSubject,BalanceWeight,ExtraParameters,Weight +#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RatingSubject,BalanceWeight,ExtraParameters,Weight PREPAID_10,*topup_reset,*monetary,*out,10,*unlimited,*any,,10,,10 diff --git a/data/tariffplans/prepaid1centpsec/Actions.csv b/data/tariffplans/prepaid1centpsec/Actions.csv index b882cd2ae..620e17566 100644 --- a/data/tariffplans/prepaid1centpsec/Actions.csv +++ b/data/tariffplans/prepaid1centpsec/Actions.csv @@ -1,2 +1,2 @@ -#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RateSubject,BalanceWeight,ExtraParameters,Weight +#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RatingSubject,BalanceWeight,ExtraParameters,Weight PREPAID_10,*topup_reset,*monetary,*out,10,*unlimited,*any,,10,,10 diff --git a/engine/storage_sql.go b/engine/storage_sql.go index a64561411..33fc72372 100644 --- a/engine/storage_sql.go +++ b/engine/storage_sql.go @@ -532,7 +532,7 @@ func (self *SQLStorage) SetTPActions(tpid string, acts map[string][]*Action) err if len(acts) == 0 { return nil //Nothing to set } - qry := fmt.Sprintf("INSERT INTO %s (tpid,tag,action,balance_type,direction,units,expiry_time,destination_tag,rate_subject,balance_weight,extra_parameters,weight) VALUES ", utils.TBL_TP_ACTIONS) + qry := fmt.Sprintf("INSERT INTO %s (tpid,tag,action,balance_type,direction,units,expiry_time,destination_tag,rating_subject,balance_weight,extra_parameters,weight) VALUES ", utils.TBL_TP_ACTIONS) i := 0 for actId, actRows := range acts { for _, act := range actRows { @@ -552,7 +552,7 @@ func (self *SQLStorage) SetTPActions(tpid string, acts map[string][]*Action) err } func (self *SQLStorage) GetTPActions(tpid, actsId string) (*utils.TPActions, error) { - rows, err := self.Db.Query(fmt.Sprintf("SELECT action,balance_type,direction,units,expiry_time,destination_tag,rate_subject,balance_weight,extra_parameters,weight FROM %s WHERE tpid='%s' AND tag='%s'", utils.TBL_TP_ACTIONS, tpid, actsId)) + rows, err := self.Db.Query(fmt.Sprintf("SELECT action,balance_type,direction,units,expiry_time,destination_tag,rating_subject,balance_weight,extra_parameters,weight FROM %s WHERE tpid='%s' AND tag='%s'", utils.TBL_TP_ACTIONS, tpid, actsId)) if err != nil { return nil, err } @@ -1086,8 +1086,8 @@ func (self *SQLStorage) GetTpActions(tpid, tag string) (map[string][]*Action, er for rows.Next() { var id int var units, balance_weight, weight float64 - var tpid, tag, action, balance_type, direction, destinations_tag, rate_subject, extra_parameters, expirationDate string - if err := rows.Scan(&id, &tpid, &tag, &action, &balance_type, &direction, &units, &expirationDate, &destinations_tag, &rate_subject, &balance_weight, &extra_parameters, &weight); err != nil { + var tpid, tag, action, balance_type, direction, destinations_tag, rating_subject, extra_parameters, expirationDate string + if err := rows.Scan(&id, &tpid, &tag, &action, &balance_type, &direction, &units, &expirationDate, &destinations_tag, &rating_subject, &balance_weight, &extra_parameters, &weight); err != nil { return nil, err } a := &Action{ @@ -1101,7 +1101,7 @@ func (self *SQLStorage) GetTpActions(tpid, tag string) (map[string][]*Action, er Balance: &Balance{ Value: units, Weight: balance_weight, - RateSubject: rate_subject, + RateSubject: rating_subject, DestinationId: destinations_tag, }, }