Bug 14285: DBRev 3.21.00.003

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/Koha.pm b/Koha.pm
index 19fa67d..58de108 100644 (file)
--- 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.21.00.002";
+$VERSION = "3.21.00.003";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug-14285.sql b/installer/data/mysql/atomicupdate/bug-14285.sql
deleted file mode 100644 (file)
index 9c71a9e..0000000
--- a/installer/data/mysql/atomicupdate/bug-14285.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-INSERT IGNORE INTO language_subtag_registry( subtag, type, description, added)
-VALUES ( 'IN', 'region', 'India','2015-05-28');
-
-INSERT IGNORE INTO language_descriptions(subtag, type, lang, description)
-VALUES ( 'IN', 'region', 'en', 'India');
-
-INSERT IGNORE INTO language_descriptions(subtag, type, lang, description)
-VALUES ( 'IN', 'region', 'bn', 'ভারত');
-
--- $DBversion = "3.21.00.XXX";
--- if ( CheckVersion($DBversion) ) {
---     $dbh->do(q|
---         INSERT IGNORE INTO language_subtag_registry( subtag, type, description, added)
---         VALUES ( 'IN', 'region', 'India','2015-05-28');
---     |);
---
---     $dbh->do(q|
---         INSERT IGNORE INTO language_descriptions(subtag, type, lang, description)
---         VALUES ( 'IN', 'region', 'en', 'India');
---     |);
---
---     $dbh->do(q|
---         INSERT IGNORE INTO language_descriptions(subtag, type, lang, description)
---         VALUES ( 'IN', 'region', 'bn', 'ভারত');
---     |);
---
---     print "Upgrade to $DBversion done (Bug 14285: Add new region India)\n";
---     SetVersion ($DBversion);
--- }

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9ee74c1..fe71359 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -10486,6 +10486,24 @@ if ( CheckVersion($DBversion) ) {
     SetVersion ($DBversion);
 }
 
+$DBversion = "3.21.00.003";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q|
+        INSERT IGNORE INTO language_subtag_registry( subtag, type, description, added)
+        VALUES ( 'IN', 'region', 'India','2015-05-28');
+    |);
+    $dbh->do(q|
+        INSERT IGNORE INTO language_descriptions(subtag, type, lang, description)
+        VALUES ( 'IN', 'region', 'en', 'India');
+    |);
+    $dbh->do(q|
+        INSERT IGNORE INTO language_descriptions(subtag, type, lang, description)
+        VALUES ( 'IN', 'region', 'bn', 'ভারত');
+    |);
+    print "Upgrade to $DBversion done (Bug 14285: Add new region India)\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.