Bug 24986: DBRev 19.05.12.001

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

(cherry picked from commit 7efb135dfb3d16c8046877de1a47cd1a835bf5d9)
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

diff --git a/Koha.pm b/Koha.pm
index bf12393..f8373c8 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 = "19.05.12.000";
+$VERSION = "19.05.12.001";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_24986.perl b/installer/data/mysql/atomicupdate/bug_24986.perl
deleted file mode 100644 (file)
index 21b5fa8..0000000
--- a/installer/data/mysql/atomicupdate/bug_24986.perl
+++ /dev/null
@@ -1,23 +0,0 @@
-$DBversion = 'XXX'; # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-
-    for my $f (qw( streetnumber streettype zipcode mobile B_streetnumber B_streettype B_zipcode ) ) {
-        $dbh->do(qq|
-            ALTER TABLE borrowers MODIFY $f TINYTEXT DEFAULT NULL
-        |);
-        $dbh->do(qq|
-            ALTER TABLE deletedborrowers MODIFY $f TINYTEXT DEFAULT NULL
-        |);
-    }
-    for my $f ( qw( B_address altcontactfirstname altcontactsurname altcontactaddress1 altcontactaddress2 altcontactaddress3 altcontactzipcode altcontactphone ) ) {
-        $dbh->do(qq|
-            ALTER TABLE borrowers MODIFY $f MEDIUMTEXT DEFAULT NULL
-        |);
-        $dbh->do(qq|
-            ALTER TABLE deletedborrowers MODIFY $f MEDIUMTEXT DEFAULT NULL
-        |);
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 24986 - Switch borrowers address related fields to TINYTEXT or MEDIUMTEXT)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9f55aec..415c68d 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -19100,6 +19100,30 @@ if ( CheckVersion($DBversion) ) {
     SetVersion ($DBversion);
 }
 
+$DBversion = '19.05.12.001';
+if( CheckVersion( $DBversion ) ) {
+
+    for my $f (qw( streetnumber streettype zipcode mobile B_streetnumber B_streettype B_zipcode ) ) {
+        $dbh->do(qq|
+            ALTER TABLE borrowers MODIFY $f TINYTEXT DEFAULT NULL
+        |);
+        $dbh->do(qq|
+            ALTER TABLE deletedborrowers MODIFY $f TINYTEXT DEFAULT NULL
+        |);
+    }
+    for my $f ( qw( B_address altcontactfirstname altcontactsurname altcontactaddress1 altcontactaddress2 altcontactaddress3 altcontactzipcode altcontactphone ) ) {
+        $dbh->do(qq|
+            ALTER TABLE borrowers MODIFY $f MEDIUMTEXT DEFAULT NULL
+        |);
+        $dbh->do(qq|
+            ALTER TABLE deletedborrowers MODIFY $f MEDIUMTEXT DEFAULT NULL
+        |);
+    }
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 24986 - Switch borrowers address related fields to TINYTEXT or MEDIUMTEXT)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.