From: Elena Mamontova <helenh463@gmail.com>
Date: Wed, 19 Oct 2016 13:39:38 +0000 (+0300)
Subject: Ticket 37. In the SaveTariff() function  unsigned num variable added,
X-Git-Tag: 2.409~56
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/f6eb7e68d3af08757b683092705dcd72ba1f4796?hp=a481c1e57ecc91e87e24f8074602f5ed3de77a07

Ticket 37. In the SaveTariff() function  unsigned num variable added,
schemaVersion checking and id value setting depending on the version added.
---

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
index cef5b203..c3aecbec 100644
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -165,23 +165,32 @@ try
 
     query += " where pk_tariff = ?";
 
+    unsigned num = 5;
     st->Prepare(query);
     st->Set(1, td.tariffConf.fee);
     st->Set(2, td.tariffConf.free);
     st->Set(3, td.tariffConf.passiveCost);
     st->Set(4, td.tariffConf.traffType);
+    if (schemaVersion == 0)
+        st->Set(num, id);
 
     if (schemaVersion > 0)
+        {
         st->Set(5, TARIFF::PeriodToString(td.tariffConf.period));
+        if (schemaVersion == 1)
+            st->Set(num + 1, id);
+        }
+
     if (schemaVersion > 1)
         {
         st->Set(6, TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));
         IBPP::Timestamp policyTimeout;
         time_t2ts(td.tariffConf.changePolicyTimeout, &policyTimeout);
         st->Set(7, policyTimeout);
+        if (schemaVersion == 2)
+            st->Set(num + 3, id);
         }
 
-    st->Set(8, id);
     st->Execute();
     st->Close();