From cef3745aae53dad48c5cea654041d7bd24e0e71e Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 9 Dec 2019 14:56:10 +0000 Subject: [PATCH] Bug 17831: DBRev 19.12.00.001 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_17831_bibliosubject.perl | 6 ------ installer/data/mysql/updatedatabase.pl | 7 +++++++ 3 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_17831_bibliosubject.perl diff --git a/Koha.pm b/Koha.pm index bf67f87492..1f2ceb2a3f 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.12.00.000"; +$VERSION = "19.12.00.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_17831_bibliosubject.perl b/installer/data/mysql/atomicupdate/bug_17831_bibliosubject.perl deleted file mode 100644 index 09b694528a..0000000000 --- a/installer/data/mysql/atomicupdate/bug_17831_bibliosubject.perl +++ /dev/null @@ -1,6 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - $dbh->do( "UPDATE marc_subfield_structure SET kohafield = NULL WHERE kohafield = 'bibliosubject.subject';" ); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 17831 - Remove non-existing bibliosubject.subject from frameworks)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 998a6016c0..af04501a5a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20238,6 +20238,13 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Dobbie is a free elf...)\n"; } +$DBversion = '19.12.00.001'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE marc_subfield_structure SET kohafield = NULL WHERE kohafield = 'bibliosubject.subject';" ); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17831 - Remove non-existing bibliosubject.subject from frameworks)\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/';