Ticket. The stgTime argument added in TariffChangeIsAllowed() function

[stg.git] / projects / stargazer / plugins / store / postgresql / postgresql_store_tariffs.cpp

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
index c509c39c1f56dbb53be3ccdb09c8acfe1906410d..fd0b38bca4f9a6056a52d9d3d9ca178290435c86 100644 (file)
--- 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 <libpq-fe.h>
 
+#include "stg/common.h"
 #include "postgresql_store.h"
 #include "stg/locker.h"
 
@@ -318,7 +319,8 @@ int32_t id;
         query << ", period = '" << TARIFF::PeriodToString(td.tariffConf.period) << "'";
 
     if (version > 7)
-        query << ", change_policy = '" << TARIFF::ChangePolicyToString(td.tariffConf.changePolicy) << "'";
+        query << ", change_policy = '" << TARIFF::ChangePolicyToString(td.tariffConf.changePolicy) << "', \
+                  change_policy_timeout = CAST('" << formatTime(td.tariffConf.changePolicyTimeout) << "' AS TIMESTAMP)";
 
     query << " WHERE pk_tariff = " << id;
 
@@ -459,7 +461,8 @@ if (version > 6)
     query << ", period";
 
 if (version > 7)
-    query << ", change_policy";
+    query << ", change_policy \
+              , change_policy_timeout";
 
 query << " FROM tb_tariffs WHERE name = '" << ename << "'";
 
@@ -512,7 +515,10 @@ if (version > 6)
     td->tariffConf.period = TARIFF::StringToPeriod(PQgetvalue(result, 0, 5));
 
 if (version > 7)
+    {
     td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(PQgetvalue(result, 0, 6));
+    td->tariffConf.changePolicyTimeout = readTime(PQgetvalue(result, 0, 7));
+    }
 
 PQclear(result);