From ad7fcdecc3394c276c154781de8a90f0eef589eb Mon Sep 17 00:00:00 2001 From: Martin Persson Date: Wed, 27 May 2015 07:36:33 +0200 Subject: [PATCH] [PASSED QA] Bug 14246: Add borrowernumber, altered SQL As suggested by kind reviewers, an AFTER statement was added to the atomic upgrade script to ensure that the final field order is consistent is both fresh and upgraded databases. Also: * UPDATE action changed to CASCADE to improve robustness. Test plan: * Apply first patch in this set. * Apply this patch. * Perform a database upgrade. * Use mysql client to inspect field order. It should be identical to the kohastructure.sql order. Sponsored-by: Halland County Library Signed-off-by: Nick Clemens Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer --- installer/data/mysql/atomicupdate/bug_14246-add_news_author.sql | 4 ++-- installer/data/mysql/kohastructure.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_14246-add_news_author.sql b/installer/data/mysql/atomicupdate/bug_14246-add_news_author.sql index 1319d37..0a9362a 100644 --- a/installer/data/mysql/atomicupdate/bug_14246-add_news_author.sql +++ b/installer/data/mysql/atomicupdate/bug_14246-add_news_author.sql @@ -1,2 +1,2 @@ -ALTER TABLE `opac_news` ADD `borrowernumber` INT(11) default NULL; -ALTER TABLE `opac_news` ADD CONSTRAINT `borrowernumber_fk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers`(`borrowernumber`) ON DELETE SET NULL ON UPDATE SET NULL; +ALTER TABLE `opac_news` ADD `borrowernumber` int(11) AFTER `number` default NULL; +ALTER TABLE `opac_news` ADD CONSTRAINT `borrowernumber_fk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers`(`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE; diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 634ab31..594dd4a 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1691,7 +1691,7 @@ CREATE TABLE `opac_news` ( -- data from the news tool `number` int(11) default NULL, -- the order in which this article appears in that specific location `borrowernumber` int(11) default NULL, -- The user who created the news article PRIMARY KEY (`idnew`), - CONSTRAINT `borrowernumber_fk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE SET NULL, + CONSTRAINT `borrowernumber_fk` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT opac_news_branchcode_ibfk FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -- 1.9.1