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 <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ed10e5226cc8e9852dfee3f5520976695cb99412)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0e6a85ad7c09eccc99fbce9af47d4ae9ddae4350)

diff --git a/installer/data/mysql/es-ES/optional/parameters.sql b/installer/data/mysql/es-ES/optional/parameters.sql
index 84a176b..00cc5a9 100644 (file)
--- 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 1319f33..806bba7 100644 (file)
--- 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 0670137..6343e54 100644 (file)
--- 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 bfc9084..2b7b886 100644 (file)
--- 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 ef32083..87af401 100644 (file)
--- 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 ef32083..87af401 100644 (file)
--- 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);