Bug 11879: DBRev 21.06.00.007

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/Koha.pm b/Koha.pm
index 65ad2a3..fb29cce 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 = "21.06.00.006";
+$VERSION = "21.06.00.007";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.perl b/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.perl
deleted file mode 100644 (file)
index a422b78..0000000
--- a/installer/data/mysql/atomicupdate/borrowers_primary_contact_method.perl
+++ /dev/null
@@ -1,17 +0,0 @@
-$DBversion = 'XXX'; # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-    if( !column_exists( 'borrowers', 'primary_contact_method' ) ) {
-        $dbh->do( "ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `autorenew_checkouts`" );
-    }
-
-    if( !column_exists( 'deletedborrowers', 'primary_contact_method' ) ) {
-        $dbh->do( "ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `autorenew_checkouts`" );
-    }
-
-    if( !column_exists( 'borrower_modifications', 'primary_contact_method' ) ) {
-        $dbh->do( "ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `gdpr_proc_consent`" );
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 11879 - Add a new field to patron record: main contact method)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index cc3d5ec..0ab880f 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -24394,6 +24394,23 @@ if( CheckVersion( $DBversion ) ){
     NewVersion( $DBversion, 14237, ["Add course_items.biblionumber column", "Add fk_course_items_biblionumber constraint", "Change course_items.itemnumber to allow NULL values"] );
 }
 
+$DBversion = '21.06.00.007';
+if( CheckVersion( $DBversion ) ) {
+    if( !column_exists( 'borrowers', 'primary_contact_method' ) ) {
+        $dbh->do( "ALTER TABLE `borrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `autorenew_checkouts`" );
+    }
+
+    if( !column_exists( 'deletedborrowers', 'primary_contact_method' ) ) {
+        $dbh->do( "ALTER TABLE `deletedborrowers` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `autorenew_checkouts`" );
+    }
+
+    if( !column_exists( 'borrower_modifications', 'primary_contact_method' ) ) {
+        $dbh->do( "ALTER TABLE `borrower_modifications` ADD COLUMN `primary_contact_method` VARCHAR(45) DEFAULT NULL AFTER `gdpr_proc_consent`" );
+    }
+
+    NewVersion( $DBversion, 11879, "Add a new field to patron record: main contact method");
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/';