From 4e69b25e71fcb74ce3c2d3830deafdd1569fe361 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 2 Sep 2015 09:45:35 -0300 Subject: [PATCH] Bug 14205: DBRev 3.21.00.22 Signed-off-by: Tomas Cohen Arazi --- Koha.pm | 2 +- .../bug_14205-add_fk_course_reserves_ci_id.sql | 2 -- installer/data/mysql/updatedatabase.pl | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14205-add_fk_course_reserves_ci_id.sql diff --git a/Koha.pm b/Koha.pm index d507d1f740..ee96adf9b6 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.21.00.021"; +$VERSION = "3.21.00.022"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_14205-add_fk_course_reserves_ci_id.sql b/installer/data/mysql/atomicupdate/bug_14205-add_fk_course_reserves_ci_id.sql deleted file mode 100644 index 1a68545840..0000000000 --- a/installer/data/mysql/atomicupdate/bug_14205-add_fk_course_reserves_ci_id.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE cr.* FROM course_reserves AS cr LEFT JOIN course_items USING(ci_id) WHERE course_items.ci_id IS NULL; -ALTER TABLE course_reserves add CONSTRAINT course_reserves_ibfk_2 FOREIGN KEY (ci_id) REFERENCES course_items (ci_id) ON DELETE CASCADE ON UPDATE CASCADE; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 6e99abbea8..7f340a6a17 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10796,6 +10796,24 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.21.00.022"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + DELETE cr.* + FROM course_reserves AS cr + LEFT JOIN course_items USING(ci_id) + WHERE course_items.ci_id IS NULL + }); + $dbh->do(q{ + ALTER IGNORE TABLE course_reserves + add CONSTRAINT course_reserves_ibfk_2 + FOREIGN KEY (ci_id) REFERENCES course_items (ci_id) + ON DELETE CASCADE ON UPDATE CASCADE + }); + print "Upgrade to $DBversion done (Bug 14205: Deleting an Item/Record does not remove link to course reserve)\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.