From c00169e536780bb371351fab8fdd119718145fcd Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 23 Feb 2016 15:43:29 +0000 Subject: [PATCH] DBRev for Bug 13534 [Followup] - Remove tabs and atomic update file --- .../data/mysql/atomicupdate/bug_13534.sql | 6 ---- installer/data/mysql/updatedatabase.pl | 35 +++++++------------ 2 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_13534.sql 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 639ecc59e3..e961ffd2b0 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11763,10 +11763,10 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } - $DBversion = "3.23.00.021"; - if ( CheckVersion($DBversion) ) { +$DBversion = "3.23.00.021"; +if ( CheckVersion($DBversion) ) { $dbh->do(q{ - INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('ShowAllCheckins', '0', '', 'Show all checkins', 'YesNo'); + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('ShowAllCheckins', '0', '', 'Show all checkins', 'YesNo'); }); print "Upgrade to $DBversion done (Bug 15736 - Add a preference to control whether all items should be shown in checked-in items list)\n"; @@ -11774,25 +11774,16 @@ if ( CheckVersion($DBversion) ) { } $DBversion = "3.23.00.022"; - 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); - } +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 -- 2.39.5