From: Elena Mamontova Date: Tue, 26 Jul 2016 11:40:49 +0000 (+0300) Subject: Ticket 37. Construction if for the schemaVersion checking changed in the X-Git-Tag: 2.409~141 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/ad32e2b6fbd75d8f77b2e9ca2f4d3bee0ad269de?ds=sidebyside;hp=b8c74dd8d281b85e810c72bdc8e315bab9821aa1 Ticket 37. Construction if for the schemaVersion checking changed in the 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 eef976c6..b00fd122 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp +++ b/projects/stargazer/plugins/store/firebird/firebird_store_tariffs.cpp @@ -150,54 +150,30 @@ try int32_t id; st->Get(1, id); st->Close(); - if (schemaVersion == 1) - { - st->Prepare("update tb_tariffs set \ - fee = ?, \ - free = ?, \ - passive_cost = ?, \ - traff_type = ?, \ - period = ? \ - 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); + + std::string query = "update tb_tariffs set \ + fee = ?, \ + free = ?, \ + passive_cost = ?, \ + traff_type = ?"; + + if (schemaVersion > 0) + query += ", period = ?"; + if (schemaVersion > 1) + query += ", change_policy = ?"; + + query += " 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); + + if (schemaVersion > 0) st->Set(5, TARIFF::PeriodToString(td.tariffConf.period)); - st->Set(6, id); - } - else if (schemaVersion > 1) - { - st->Prepare("update tb_tariffs set \ - fee = ?, \ - free = ?, \ - passive_cost = ?, \ - traff_type = ?, \ - period = ?, \ - change_policy = ? \ - 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, TARIFF::PeriodToString(td.tariffConf.period)); - 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); - } + if (schemaVersion > 1) + st->Set(6, TARIFF::ChangePolicyToString(td.tariffConf.changePolicy)); + st->Execute(); st->Close();