From 0f4dd316d5661d99789687096900f27319931f29 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 17 Dec 2018 11:15:50 +0000 Subject: [PATCH] Bug 19066: (QA follow-up) Define foreign key for branchcode Signed-off-by: Martin Renvoize --- .../atomicupdate/bug_19066_add_accountlines_branchcode.perl | 1 + installer/data/mysql/kohastructure.sql | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/atomicupdate/bug_19066_add_accountlines_branchcode.perl b/installer/data/mysql/atomicupdate/bug_19066_add_accountlines_branchcode.perl index 426d997da5..62bbd550c1 100644 --- a/installer/data/mysql/atomicupdate/bug_19066_add_accountlines_branchcode.perl +++ b/installer/data/mysql/atomicupdate/bug_19066_add_accountlines_branchcode.perl @@ -3,6 +3,7 @@ if( CheckVersion( $DBversion ) ) { if( !column_exists( 'accountlines', 'branchcode' ) ) { $dbh->do("ALTER TABLE accountlines ADD branchcode VARCHAR( 10 ) NULL DEFAULT NULL AFTER manager_id"); + $dbh->do("ALTER TABLE accountlines ADD CONSTRAINT accountlines_ibfk_branches FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE"); } # Always end with this (adjust the bug info) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 9a4edd1b03..f166ddf3b3 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -2723,8 +2723,10 @@ CREATE TABLE `accountlines` ( KEY `acctsborridx` (`borrowernumber`), KEY `timeidx` (`timestamp`), KEY `itemnumber` (`itemnumber`), + KEY `branchcode` (`branchcode`), CONSTRAINT `accountlines_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE ON UPDATE CASCADE, - CONSTRAINT `accountlines_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL + CONSTRAINT `accountlines_ibfk_2` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE SET NULL ON UPDATE SET NULL, + CONSTRAINT `accountlines_ibfk_branches` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE SET NULL ON UPDATE SET CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- -- 2.19.2