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 cef5b203c87822987eccb01aa7c5ea576d700b05..c3aecbec4aed6b037bc007cb68c08b6c597ebf37 100644 (file)
--- 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 = ?";
 
 
     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);
     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)
 
     if (schemaVersion > 0)

+        {

         st->Set(5, TARIFF::PeriodToString(td.tariffConf.period));
         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 > 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();
 
     st->Execute();
     st->Close();