From ed10e5226cc8e9852dfee3f5520976695cb99412 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 17 Mar 2014 17:21:09 +0100 Subject: [PATCH] Bug 11939: set active currency for non-English sample data Revised Test Plan ----------------- The following SQL commands were used to test this. installer/data/mysql/en/optional/parameters.sql is part of the first patch and didn't really need testing again. installer/data/mysql/de-DE/optional/parameters.sql is not part of the patch, but since I was playing with the script, which is also attached here, it was included for good measure. use kohadata; SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/pl-PL/optional/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/es-ES/optional/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/ru-RU/optional/sample_currency.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/uk-UA/optional/sample_currency.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/it-IT/necessari/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/de-DE/optional/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/en/optional/parameters.sql Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton --- installer/data/mysql/es-ES/optional/parameters.sql | 10 +++++----- installer/data/mysql/it-IT/necessari/parameters.sql | 8 ++++---- .../data/mysql/nb-NO/2-Valgfritt/parameters.sql | 10 +++++----- installer/data/mysql/pl-PL/optional/parameters.sql | 10 +++++----- .../data/mysql/ru-RU/optional/sample_currency.sql | 12 ++++++------ .../data/mysql/uk-UA/optional/sample_currency.sql | 12 ++++++------ 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/installer/data/mysql/es-ES/optional/parameters.sql b/installer/data/mysql/es-ES/optional/parameters.sql index 84a176b60a..00cc5a9820 100644 --- a/installer/data/mysql/es-ES/optional/parameters.sql +++ b/installer/data/mysql/es-ES/optional/parameters.sql @@ -1,6 +1,6 @@ -INSERT INTO `currency` (currency, rate, symbol) VALUES -('USD', 1.0, '$'), -('GBP', 1.9929, '£'), -('CAD', 1.02207, '$'), -('EUR', .874003, '€'); +INSERT INTO `currency` (currency, rate, symbol, active) VALUES +('USD', 1.0, '$', 0), +('GBP', 1.9929, '£', 0), +('CAD', 1.02207, '$', 0), +('EUR', .874003, '€', 1); diff --git a/installer/data/mysql/it-IT/necessari/parameters.sql b/installer/data/mysql/it-IT/necessari/parameters.sql index 1319f33f70..806bba7c85 100644 --- a/installer/data/mysql/it-IT/necessari/parameters.sql +++ b/installer/data/mysql/it-IT/necessari/parameters.sql @@ -1,8 +1,8 @@ SET FOREIGN_KEY_CHECKS=0; -INSERT INTO `currency` (currency, rate, symbol) VALUES -('USD', 1.4, '$'), -('GBP', .8, '£'), -('EUR', 1, '€'); +INSERT INTO `currency` (currency, rate, symbol, active) VALUES +('USD', 1.4, '$', 0), +('GBP', .8, '£', 0), +('EUR', 1, '€', 1); SET FOREIGN_KEY_CHECKS=1; diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql b/installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql index 067013742a..6343e54395 100644 --- a/installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql +++ b/installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql @@ -19,8 +19,8 @@ -- with Koha; if not, write to the Free Software Foundation, Inc., -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -INSERT INTO `currency` (currency, rate, symbol) VALUES -('USD', 5.6157, '$'), -('NOK', 1.0, '$'), -('GBP', 8.9680, '£'), -('EUR', 7.8940, '€'); +INSERT INTO `currency` (currency, rate, symbol, active) VALUES +('USD', 5.6157, '$', 0), +('NOK', 1.0, '$', 1), +('GBP', 8.9680, '£', 0), +('EUR', 7.8940, '€', 0); diff --git a/installer/data/mysql/pl-PL/optional/parameters.sql b/installer/data/mysql/pl-PL/optional/parameters.sql index bfc908434c..2b7b886de9 100644 --- a/installer/data/mysql/pl-PL/optional/parameters.sql +++ b/installer/data/mysql/pl-PL/optional/parameters.sql @@ -1,6 +1,6 @@ -INSERT INTO `currency` (currency, rate, symbol) VALUES -('PLN', 1.0, 'zł'), -('USD', 2.77, '$'), -('GBP', 4.5, '£'), -('EUR', 4.1, '€'); +INSERT INTO `currency` (currency, rate, symbol, active) VALUES +('PLN', 1.0, 'zł', 1), +('USD', 2.77, '$', 0), +('GBP', 4.5, '£', 0), +('EUR', 4.1, '€', 0); diff --git a/installer/data/mysql/ru-RU/optional/sample_currency.sql b/installer/data/mysql/ru-RU/optional/sample_currency.sql index ef320836d7..87af40157f 100644 --- a/installer/data/mysql/ru-RU/optional/sample_currency.sql +++ b/installer/data/mysql/ru-RU/optional/sample_currency.sql @@ -1,13 +1,13 @@ TRUNCATE currency; -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('CAD','$','2009-01-23 08:15:20',6.157690); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('CAD','$','2009-01-23 08:15:20',6.157690, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('EUR','€','2009-01-23 08:15:20',9.852920); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('EUR','€','2009-01-23 08:15:20',9.852920, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('GPB','£','2009-01-23 08:15:20',11.317390); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('GPB','£','2009-01-23 08:15:20',11.317390, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('GRN','грн.','2009-01-28 00:00:00',1.0); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('GRN','грн.','2009-01-28 00:00:00',1.0, 1); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('RUB','руб.','2009-01-28 00:00:00',21.166); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('RUB','руб.','2009-01-28 00:00:00',21.166, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('USD','$','2009-01-23 08:15:20',7.7); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('USD','$','2009-01-23 08:15:20',7.7, 0); diff --git a/installer/data/mysql/uk-UA/optional/sample_currency.sql b/installer/data/mysql/uk-UA/optional/sample_currency.sql index ef320836d7..87af40157f 100644 --- a/installer/data/mysql/uk-UA/optional/sample_currency.sql +++ b/installer/data/mysql/uk-UA/optional/sample_currency.sql @@ -1,13 +1,13 @@ TRUNCATE currency; -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('CAD','$','2009-01-23 08:15:20',6.157690); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('CAD','$','2009-01-23 08:15:20',6.157690, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('EUR','€','2009-01-23 08:15:20',9.852920); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('EUR','€','2009-01-23 08:15:20',9.852920, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('GPB','£','2009-01-23 08:15:20',11.317390); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('GPB','£','2009-01-23 08:15:20',11.317390, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('GRN','грн.','2009-01-28 00:00:00',1.0); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('GRN','грн.','2009-01-28 00:00:00',1.0, 1); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('RUB','руб.','2009-01-28 00:00:00',21.166); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('RUB','руб.','2009-01-28 00:00:00',21.166, 0); -INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`) VALUES ('USD','$','2009-01-23 08:15:20',7.7); +INSERT INTO `currency` (`currency`, `symbol`, `timestamp`, `rate`, active) VALUES ('USD','$','2009-01-23 08:15:20',7.7, 0);