From a7d5a4cc82ad7a1402eb0d11fd6d9613cadfa13a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 10 Sep 2019 09:38:39 +0100 Subject: [PATCH] Bug 22996: DBRev 19.06.00.25 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_22996.perl | 6 ------ installer/data/mysql/updatedatabase.pl | 7 +++++++ 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_22996.perl diff --git a/Koha.pm b/Koha.pm index 179335f066..0402845f34 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 = "19.06.00.024"; +$VERSION = "19.06.00.025"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_22996.perl b/installer/data/mysql/atomicupdate/bug_22996.perl deleted file mode 100644 index c90d71b432..0000000000 --- a/installer/data/mysql/atomicupdate/bug_22996.perl +++ /dev/null @@ -1,6 +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 (?, ?, ?, ?, ?)/, undef, 'BarcodeSeparators','\s\r\n','','Splitting characters for barcodes','Free' ); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22996 - Add pref BarcodeSeparators)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4f4b2e90a2..d9fb840f7d 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -19379,6 +19379,13 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 23539 - accountlines.accounttype should match authorised_values.authorised_value in size)\n"; } +$DBversion = '19.06.00.025'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( q/INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES (?, ?, ?, ?, ?)/, undef, 'BarcodeSeparators','\s\r\n','','Splitting characters for barcodes','Free' ); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22996 - Add pref BarcodeSeparators)\n"; +} + # 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/'; -- 2.39.5