From b8c74dd8d281b85e810c72bdc8e315bab9821aa1 Mon Sep 17 00:00:00 2001 From: Elena Mamontova Date: Wed, 13 Jul 2016 10:52:06 +0300 Subject: [PATCH 1/1] Ticket 37. if (schemaVersion > 1) - else if - else construction format changed in the Save() function. --- .../store/firebird/firebird_store_tariffs.cpp | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp index 2ca60e7f..eef976c6 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp +++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp @@ -166,9 +166,7 @@ try st->Set(5, TARIFF::PeriodToString(td.tariffConf.period)); st->Set(6, id); } - else - { - if (schemaVersion > 1) + else if (schemaVersion > 1) { st->Prepare("update tb_tariffs set \ fee = ?, \ @@ -186,20 +184,19 @@ try st->Set(6, TARIFF::ChangePolicyToString(td.tariffConf.changePolicy)); st->Set(7, id); } - else - { - st->Prepare("update tb_tariffs set \ - fee = ?, \ - free = ?, \ - passive_cost = ?, \ - traff_type = ? \ - where pk_tariff = ?"); - 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->Set(5, id); - } + else + { + st->Prepare("update tb_tariffs set \ + fee = ?, \ + free = ?, \ + passive_cost = ?, \ + traff_type = ? \ + where pk_tariff = ?"); + 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->Set(5, id); } st->Execute(); st->Close(); -- 2.44.2