From cea8fccd11b822874374e9c15f0f6691c9850787 Mon Sep 17 00:00:00 2001 From: Hayley Mapley Date: Tue, 18 Feb 2020 10:19:08 +1300 Subject: [PATCH] Bug 22868: DBRev 18.11.14.001 Signed-off-by: Hayley Mapley --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_22868.perl | 19 ------------------ installer/data/mysql/updatedatabase.pl | 20 +++++++++++++++++++ 3 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_22868.perl diff --git a/Koha.pm b/Koha.pm index b9909eaed7..4f0fa8e7ba 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 = "18.11.13.000"; +$VERSION = "18.11.13.001"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_22868.perl b/installer/data/mysql/atomicupdate/bug_22868.perl deleted file mode 100644 index ab4853dc45..0000000000 --- a/installer/data/mysql/atomicupdate/bug_22868.perl +++ /dev/null @@ -1,19 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - INSERT IGNORE INTO `userflags` (`bit`, `flag`, `flagdesc`, `defaulton`) - VALUES (12, 'suggestions', 'Suggestion management', 0) - }); - - $dbh->do(q{ - UPDATE permissions SET module_bit=12 - WHERE code="suggestions_manage" - }); - - $dbh->do(q{ - UPDATE borrowers SET flags = flags + (1<<12) WHERE flags & (1 << 11) - }); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22868 - Move suggestions_manage subpermission out of acquisition permission)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 78a35d3f46..514de2690a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -17578,6 +17578,26 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "18.11.14.001"; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO `userflags` (`bit`, `flag`, `flagdesc`, `defaulton`) + VALUES (12, 'suggestions', 'Suggestion management', 0) + }); + + $dbh->do(q{ + UPDATE permissions SET module_bit=12 + WHERE code="suggestions_manage" + }); + + $dbh->do(q{ + UPDATE borrowers SET flags = flags + (1<<12) WHERE flags & (1 << 11) + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22868 - Move suggestions_manage subpermission out of acquisition permission)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5