From: Elena Mamontova Date: Fri, 21 Oct 2016 09:09:24 +0000 (+0300) Subject: Ticket 37. The checking schemaVersion = 0, 1, 2 removed, X-Git-Tag: 2.409~55 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/0ebf0bbd982e8a758e820d273f9eb1409647a733 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 c3aecbec..4e666794 100644 --- 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); - 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); + ++num; } if (schemaVersion > 1) @@ -187,10 +184,10 @@ try 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();