From f528a68059e2b2ad18c242c4f55fbc9310af07f7 Mon Sep 17 00:00:00 2001 From: Brendan Gallagher Date: Tue, 23 Feb 2016 15:33:41 +0000 Subject: [PATCH] Bug 13534: Update DB rev (3.20.08.003) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Julian Maurice (cherry picked from commit 9ad830d04b88e16c44824f3fd1052dd566df3345) Signed-off-by: Frédéric Demians --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_13534.sql | 6 ------ installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_13534.sql diff --git a/Koha.pm b/Koha.pm index 0d7aa5ad18..abc0dccb72 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 = "3.20.08.002"; +$VERSION = "3.20.08.003"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_13534.sql b/installer/data/mysql/atomicupdate/bug_13534.sql deleted file mode 100644 index 3b59893a13..0000000000 --- a/installer/data/mysql/atomicupdate/bug_13534.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE tags_all MODIFY COLUMN borrowernumber INT(11); -ALTER TABLE tags_all drop FOREIGN KEY tags_borrowers_fk_1; -ALTER TABLE tags_all ADD CONSTRAINT `tags_borrowers_fk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE; - -ALTER TABLE tags_approval DROP FOREIGN KEY tags_approval_borrowers_fk_1; -ALTER TABLE tags_approval ADD CONSTRAINT `tags_approval_borrowers_fk_1` FOREIGN KEY (`approved_by`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index b70c14c5ad..0a1f3ce874 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10734,6 +10734,18 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.20.08.003"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ ALTER TABLE tags_all MODIFY COLUMN borrowernumber INT(11) }); + $dbh->do(q{ ALTER TABLE tags_all drop FOREIGN KEY tags_borrowers_fk_1 }); + $dbh->do(q{ ALTER TABLE tags_all ADD CONSTRAINT `tags_borrowers_fk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE }); + $dbh->do(q{ ALTER TABLE tags_approval DROP FOREIGN KEY tags_approval_borrowers_fk_1 }); + $dbh->do(q{ ALTER TABLE tags_approval ADD CONSTRAINT `tags_approval_borrowers_fk_1` FOREIGN KEY (`approved_by`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE }); + + print "Upgrade to $DBversion done (Bug 13534 - Deleting staff patron will delete tags approved by this patron)\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