From d2abcdb9438fd6e1298fcc288b07901a11b57be2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Sun, 25 Sep 2016 14:02:13 +0000 Subject: [PATCH] Bug 14707: Update DB rev (3.22.11.001) (cherry picked from commit c73b60d7168f7f00226d01b09c604f253f35c36c) Signed-off-by: Julian Maurice --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_14707.sql | 15 ------ installer/data/mysql/updatedatabase.pl | 50 +++++++++++++++++++ 3 files changed, 51 insertions(+), 16 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14707.sql diff --git a/Koha.pm b/Koha.pm index b36436765b..cf695d35a3 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "3.22.11.000"; +$VERSION = "3.22.11.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_14707.sql b/installer/data/mysql/atomicupdate/bug_14707.sql deleted file mode 100644 index 101a87be19..0000000000 --- a/installer/data/mysql/atomicupdate/bug_14707.sql +++ /dev/null @@ -1,15 +0,0 @@ -UPDATE systempreferences SET type="Choice" where variable="UsageStatsLibraryType"; - -UPDATE systempreferences SET value="Canada" WHERE variable="UsageStatsCountry" AND value="CANADA"; -UPDATE systempreferences SET value="Czech Republic" WHERE variable="UsageStatsCountry" AND value="CZ"; -UPDATE systempreferences SET value="United Kingdom" WHERE variable="UsageStatsCountry" AND (value="England" OR value="UK"); -UPDATE systempreferences SET value="Spain" WHERE variable="UsageStatsCountry" AND value="España"; -UPDATE systempreferences SET value="Greece" WHERE variable="UsageStatsCountry" AND value="GR"; -UPDATE systempreferences SET value="Ireland" WHERE variable="UsageStatsCountry" AND value="Irelanbd"; -UPDATE systempreferences SET value="Mexico" WHERE variable="UsageStatsCountry" AND value="México"; -UPDATE systempreferences SET value="Peru" WHERE variable="UsageStatsCountry" AND value="Perú"; -UPDATE systempreferences SET value="Dominican Rep." WHERE variable="UsageStatsCountry" AND value="República Dominicana"; -UPDATE systempreferences SET value="Trinidad & Tob." WHERE variable="UsageStatsCountry" AND value="Trinidad"; -UPDATE systempreferences SET value="Turkey" WHERE variable="UsageStatsCountry" AND value="Türkiye"; -UPDATE systempreferences SET value="USA" WHERE variable="UsageStatsCountry" AND (value="United States" OR value="United States of America" OR value="US"); -UPDATE systempreferences SET value="Zimbabwe" WHERE variable="UsageStatsCountry" AND value="Zimbabbwe"; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 6a22c89273..fea955589d 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11740,6 +11740,56 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.22.11.001"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + UPDATE systempreferences SET type="Choice" WHERE variable="UsageStatsLibraryType"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Canada" WHERE variable="UsageStatsCountry" AND value="CANADA"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Czech Republic" WHERE variable="UsageStatsCountry" AND value="CZ"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="United Kingdom" WHERE variable="UsageStatsCountry" AND (value="England" OR value="UK"); + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Spain" WHERE variable="UsageStatsCountry" AND value="España"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Greece" WHERE variable="UsageStatsCountry" AND value="GR"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Ireland" WHERE variable="UsageStatsCountry" AND value="Irelanbd"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Mexico" WHERE variable="UsageStatsCountry" AND value="México"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Peru" WHERE variable="UsageStatsCountry" AND value="Perú"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Dominican Rep." WHERE variable="UsageStatsCountry" AND value="República Dominicana"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Trinidad & Tob." WHERE variable="UsageStatsCountry" AND value="Trinidad"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Turkey" WHERE variable="UsageStatsCountry" AND value="Türkiye"; + }); + $dbh->do(q{ + UPDATE systempreferences SET value="USA" WHERE variable="UsageStatsCountry" AND (value="United States" OR value="United States of America" OR value="US"); + }); + $dbh->do(q{ + UPDATE systempreferences SET value="Zimbabwe" WHERE variable="UsageStatsCountry" AND value="Zimbabbwe"; + }); + + print "Upgrade to $DBversion done (Bug 14707 - Change UsageStatsCountry from free text to a dropdown list)\n"; + SetVersion($DBversion); +} + + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5