From 868c49d282c775c30cbdc31677cc7a2de5cc9841 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 16 Apr 2015 09:46:26 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 7976: Update borrowers.flags The borrowers.flags values need to be updated to prevent side effects. Test plan: Set the borrow permission flags for some borrowers Execute the updatedb entry and verify the flags has been updated (-128) only for borrowers with this permission set. Signed-off-by: Bernardo Gonzalez Kriegel Moved updatedatabase entry (was in wrong position) to atomicupdate with commented copy of orignal No koha-qa errors --- .../bug-7976-update-borrower-flags.sql | 23 ++++++++++++++++++++ installer/data/mysql/updatedatabase.pl | 11 ---------- 2 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug-7976-update-borrower-flags.sql diff --git a/installer/data/mysql/atomicupdate/bug-7976-update-borrower-flags.sql b/installer/data/mysql/atomicupdate/bug-7976-update-borrower-flags.sql new file mode 100644 index 0000000..2c81231 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug-7976-update-borrower-flags.sql @@ -0,0 +1,23 @@ +UPDATE borrowers +SET flags = flags - ( flags & (1<<7) ) +WHERE flags IS NOT NULL + AND flags > 0; + +DELETE FROM userflags WHERE bit=7; + +--$DBversion = "3.19.00.XXX"; +--if ( CheckVersion($DBversion) ) { +-- # Remove the borrow permission flag (bit 7) +-- $dbh->do(q| +-- UPDATE borrowers +-- SET flags = flags - ( flags & (1<<7) ) +-- WHERE flags IS NOT NULL +-- AND flags > 0 +-- |); +-- $dbh->do(q| +-- DELETE FROM userflags WHERE bit=7; +-- |); +-- print "Upgrade to $DBversion done (Bug 7976 - Remove the 'borrow' permission)\n"; +-- SetVersion($DBversion); +--} + diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index cc4f1ab..1e136aa 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10408,17 +10408,6 @@ foreach my $file ( sort readdir $dirh ) { } } - -$DBversion = "3.19.00.XXX"; -if ( CheckVersion($DBversion) ) { - $dbh->do(q| - DELETE FROM userflags WHERE bit=7; - |); - print "Upgrade to $DBversion done (Bug 7976 - Remove the 'borrow' permission)\n"; - SetVersion($DBversion); -} - - =head1 FUNCTIONS =head2 TableExists($table) -- 1.7.9.5