From 1b43b3d7acaf04e1822cdb199946aa04215b84fb Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 9 Sep 2016 13:26:20 +0000 Subject: [PATCH] Bug 16978 - DBRev 16.06.00.022 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_16978.sql | 9 --------- installer/data/mysql/updatedatabase.pl | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_16978.sql diff --git a/Koha.pm b/Koha.pm index 9c2806c21d..d77d4edb0a 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 = "16.06.00.021"; +$VERSION = "16.06.00.022"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_16978.sql b/installer/data/mysql/atomicupdate/bug_16978.sql deleted file mode 100644 index 4ee70f0bf8..0000000000 --- a/installer/data/mysql/atomicupdate/bug_16978.sql +++ /dev/null @@ -1,9 +0,0 @@ -INSERT IGNORE INTO `permissions` - (module_bit, code, description) VALUES - (16, 'delete_reports', 'Delete SQL reports'); - -INSERT IGNORE INTO user_permissions - (borrowernumber, module_bit,code) - SELECT borrowernumber,module_bit,'delete_reports' - FROM user_permissions - WHERE module_bit=16 AND code='create_reports'; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7bf758575b..54a29a14b1 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12907,6 +12907,25 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "16.06.00.022"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + INSERT IGNORE INTO `permissions` + (module_bit, code, description) VALUES + (16, 'delete_reports', 'Delete SQL reports'); + }); + $dbh->do(q{ + INSERT IGNORE INTO user_permissions + (borrowernumber, module_bit,code) + SELECT borrowernumber,module_bit,'delete_reports' + FROM user_permissions + WHERE module_bit=16 AND code='create_reports'; + }); + + print "Upgrade to $DBversion done (Bug 16978 - Add delete reports user permission)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.39.5