Ticket 37. The checking schemaVersion = 0, 1, 2 removed,

st->Set(num, id) added before st->Execute() in SaveTariff() function.

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
index c3aecbec4aed6b037bc007cb68c08b6c597ebf37..4e666794c90e62f97a07fd8482b3dc00e45dd38f 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp
@@ -171,14 +171,11 @@ try
     st->Set(2, td.tariffConf.free);
     st->Set(3, td.tariffConf.passiveCost);
     st->Set(4, td.tariffConf.traffType);
     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 > 0)
         {
         st->Set(5, TARIFF::PeriodToString(td.tariffConf.period));

-        if (schemaVersion == 1)
-            st->Set(num + 1, id);
+        ++num;

         }
 
     if (schemaVersion > 1)
         }
 
     if (schemaVersion > 1)


@@ -187,10 +184,10 @@ try
         IBPP::Timestamp policyTimeout;
         time_t2ts(td.tariffConf.changePolicyTimeout, &policyTimeout);
         st->Set(7, policyTimeout);
         IBPP::Timestamp policyTimeout;
         time_t2ts(td.tariffConf.changePolicyTimeout, &policyTimeout);
         st->Set(7, policyTimeout);

-        if (schemaVersion == 2)
-            st->Set(num + 3, id);
+        num += 2;

         }
 
         }
 

+    st->Set(num, id);

     st->Execute();
     st->Close();
 
     st->Execute();
     st->Close();