Bug 6725: DBRev 20.06.00.025

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

diff --git a/Koha.pm b/Koha.pm
index 62e1293..ba1f905 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 = "20.06.00.024";
+$VERSION = "20.06.00.025";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_6725.perl b/installer/data/mysql/atomicupdate/bug_6725.perl
deleted file mode 100644 (file)
index 9507062..0000000
--- a/installer/data/mysql/atomicupdate/bug_6725.perl
+++ /dev/null
@@ -1,11 +0,0 @@
-$DBversion = 'XXX'; # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-
-    $dbh->do( q{
-        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
-        ('PatronDuplicateMatchingAddFields','surname|firstname|dateofbirth', NULL,'A list of fields separated by "|" to deduplicate patrons when created','Free')
-    });
-
-    # Always end with this (adjust the bug info)
-    NewVersion( $DBversion, 6725, "Adds PatronDuplicateMatchingAddFields system preference");
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index bd68424..0569cb9 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -22605,6 +22605,17 @@ if( CheckVersion( $DBversion ) ) {
     NewVersion( $DBversion, 25867, "Update subfield descriptions for 952\$a and 952\$b");
 }
 
+$DBversion = '20.06.00.025';
+if( CheckVersion( $DBversion ) ) {
+
+    $dbh->do( q{
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES
+        ('PatronDuplicateMatchingAddFields','surname|firstname|dateofbirth', NULL,'A list of fields separated by "|" to deduplicate patrons when created','Free')
+    });
+
+    NewVersion( $DBversion, 6725, "Adds PatronDuplicateMatchingAddFields system preference");
+}
+
 # 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/';