From: Elena Mamontova Date: Tue, 27 Sep 2016 12:52:32 +0000 (+0300) Subject: Ticket 37. Int2TS() method changed to formatTime() function in the SaveTariff() function. X-Git-Tag: 2.409~73 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/6738cb36879ef49d635b7214fe0fd43a180f892f?hp=19175a03297f1e277e56f0eecf84e8994433106e Ticket 37. Int2TS() method changed to formatTime() function in the SaveTariff() function. TS2Int() method changed to readTime() function in the RestoreTariff() function. '#include "stg/common.h"' added. --- diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp index 1623988d..fd0b38bc 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp @@ -33,6 +33,7 @@ #include +#include "stg/common.h" #include "postgresql_store.h" #include "stg/locker.h" @@ -319,7 +320,7 @@ int32_t id; if (version > 7) query << ", change_policy = '" << TARIFF::ChangePolicyToString(td.tariffConf.changePolicy) << "', \ - change_policy_timeout = CAST('" << Int2TS(td.tariffConf.changePolicyTimeout) << "' AS TIMESTAMP)"; + change_policy_timeout = CAST('" << formatTime(td.tariffConf.changePolicyTimeout) << "' AS TIMESTAMP)"; query << " WHERE pk_tariff = " << id; @@ -516,7 +517,7 @@ if (version > 6) if (version > 7) { td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(PQgetvalue(result, 0, 6)); - td->tariffConf.changePolicyTimeout = TS2Int(PQgetvalue(result, 0, 7)); + td->tariffConf.changePolicyTimeout = readTime(PQgetvalue(result, 0, 7)); } PQclear(result);