Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 14246: Add borrowernumber, altered SQL

Browse source 
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 <nick@quecheelibrary.org>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Persson 2015-05-27 07:36:33 +02:00 committed by Tomas Cohen Arazi
parent 34818c05d5
commit b3721f71ea
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
installer/data/mysql/atomicupdate/bug_14246-add_news_author.sql
View file

@ -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;

2
installer/data/mysql/kohastructure.sql
View file

@ -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;