Attachment 82064 Details for Bug 20581 – Bug 20581: (follow-up) Modify DB updgrade

[patch] Bug 20581: (follow-up) Modify DB updgrade

Bug-20581-follow-up-Modify-DB-updgrade.patch (text/plain), 3.88 KB, created by Andrew Isherwood on 2018-11-08 12:01:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2018-11-08 12:01:34 UTC

Size: 3.88 KB

patch

obsolete

>From 2324162caa5318e6b0bf7e94e646c289e39fbd4d Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Fri, 12 Oct 2018 14:30:59 +0100
>Subject: [PATCH] Bug 20581: (follow-up) Modify DB updgrade
>
>As per
>https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20581#c56
>---
> .../bug_20581-add_new_illrequests_status_alias_column.perl        | 8 ++++++--
> installer/data/mysql/en/optional/ill_auth_cat.sql                 | 1 -
> installer/data/mysql/en/optional/ill_auth_cat.txt                 | 1 -
> installer/data/mysql/kohastructure.sql                            | 2 +-
> installer/data/mysql/mandatory/auth_val_cat.sql                   | 4 ++++
> 5 files changed, 11 insertions(+), 5 deletions(-)
> delete mode 100644 installer/data/mysql/en/optional/ill_auth_cat.sql
> delete mode 100644 installer/data/mysql/en/optional/ill_auth_cat.txt
>
>diff --git a/installer/data/mysql/atomicupdate/bug_20581-add_new_illrequests_status_alias_column.perl b/installer/data/mysql/atomicupdate/bug_20581-add_new_illrequests_status_alias_column.perl
>index 64a4824e36..881d2cd13e 100644
>--- a/installer/data/mysql/atomicupdate/bug_20581-add_new_illrequests_status_alias_column.perl
>+++ b/installer/data/mysql/atomicupdate/bug_20581-add_new_illrequests_status_alias_column.perl
>@@ -1,8 +1,12 @@
> $DBversion = 'XXX';  # will be replaced by the RM
> if( CheckVersion( $DBversion ) ) {
> 
>-    $dbh->do( "ALTER TABLE illrequests ADD COLUMN status_alias integer DEFAULT NULL" );
>-    $dbh->do( "ALTER TABLE illrequests ADD CONSTRAINT illrequests_safk FOREIGN KEY (status_alias) REFERENCES authorised_values(id) ON DELETE SET NULL" );
>+    if ( !column_exists( 'illrequests', 'status_alias' ) ) {
>+        $dbh->do( "ALTER TABLE illrequests ADD COLUMN status_alias integer DEFAULT NULL AFTER status" );
>+    }
>+    if ( !foreign_key_exists( 'illrequests', 'illrequests_safk' ) ) {
>+        $dbh->do( "ALTER TABLE illrequests ADD CONSTRAINT illrequests_safk FOREIGN KEY (status_alias) REFERENCES authorised_values(id) ON UPDATE CASCADE ON DELETE SET NULL" );
>+    }
>     $dbh->do( "INSERT IGNORE INTO authorised_value_categories SET category_name = 'ILLSTATUS'");
> 
>     SetVersion( $DBversion );
>diff --git a/installer/data/mysql/en/optional/ill_auth_cat.sql b/installer/data/mysql/en/optional/ill_auth_cat.sql
>deleted file mode 100644
>index 96e44900be..0000000000
>--- a/installer/data/mysql/en/optional/ill_auth_cat.sql
>+++ /dev/null
>@@ -1 +0,0 @@
>-INSERT IGNORE INTO authorised_value_categories (category_name) VALUES ('ILLSTATUS');
>diff --git a/installer/data/mysql/en/optional/ill_auth_cat.txt b/installer/data/mysql/en/optional/ill_auth_cat.txt
>deleted file mode 100644
>index 934903a884..0000000000
>--- a/installer/data/mysql/en/optional/ill_auth_cat.txt
>+++ /dev/null
>@@ -1 +0,0 @@
>-Default ILL request status authorised value category name
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index d4d41d90f3..71c8ea90a1 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -4174,7 +4174,7 @@ CREATE TABLE illrequests (
>     CONSTRAINT `illrequests_safk`
>       FOREIGN KEY (`status_alias`)
>       REFERENCES `authorised_values` (`id`)
>-      ON DELETE SET NULL
>+      ON UPDATE CASCADE ON DELETE SET NULL
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
> 
> --
>diff --git a/installer/data/mysql/mandatory/auth_val_cat.sql b/installer/data/mysql/mandatory/auth_val_cat.sql
>index 4ab8c0e04e..a0831af0c5 100644
>--- a/installer/data/mysql/mandatory/auth_val_cat.sql
>+++ b/installer/data/mysql/mandatory/auth_val_cat.sql
>@@ -57,3 +57,7 @@ INSERT IGNORE INTO authorised_value_categories( category_name ) VALUES
> -- For Housebound
> INSERT IGNORE INTO authorised_value_categories( category_name ) VALUES
>     ('HSBND_FREQ');
>+
>+-- For Interlibrary loans
>+INSERT IGNORE INTO authorised_value_categories( category_name ) VALUES
>+    ('ILLSTATUS');
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20581: 74323 | 74324 | 74325 | 74326 | 74327 | 74362 | 75333 | 75334 | 75810 | 77819 | 77820 | 77821 | 77822 | 77823 | 77824 | 77825 | 77826 | 78376 | 78377 | 78378 | 78379 | 78380 | 78381 | 78382 | 78383 | 78384 | 78431 | 78515 | 78516 | 78517 | 78518 | 78519 | 78520 | 78521 | 78522 | 78523 | 80279 | 80280 | 80281 | 80282 | 80283 | 80284 | 80285 | 80286 | 80474 | 80475 | 80501 | 80503 | 80505 | 80598 | 80599 | 80600 | 82063 | 82064 | 82065 | 82066 | 82067 | 82068 | 82069 | 82070 | 82071 | 82072 | 82073 | 82074 | 82075 | 82076 | 82443 | 82444 | 82445 | 82446 | 82447 | 82448 | 82449 | 82450 | 82451 | 82452 | 82453 | 82454 | 82455 | 82456 | 82457 | 82458 | 82459 | 82460 | 82461 | 82462 | 82463 | 82464 | 82465 | 82466 | 82467 | 82468 | 82472 | 82483 | 82484 | 82485 | 82486 | 82487 | 82488 | 82489 | 82490 | 82491 | 82492 | 82493 | 82494 | 82495 | 82496 | 82733 | 84202 | 84404 | 84768 | 84770 | 84771 | 84772 | 84773 | 84774 | 84775 | 84776 | 84777 | 84778 | 84779 | 84780 | 84781 | 84782 | 84783 | 84784 | 84785 | 84791 | 84814 | 84818 | 84819 | 84844 | 84911 | 84912 | 84913 | 84914 | 84915 | 84916 | 84917 | 84918 | 84919 | 84920 | 84921 | 84922 | 84923 | 84924 | 84925 | 84926 | 84927 | 84928 | 84929 | 84930 | 84931 | 84964 | 85075 | 85076 | 85077 | 85078 | 85079 | 85080 | 85081 | 85082 | 85083 | 85084 | 85085 | 85086 | 85087 | 85088 | 85089 | 85090 | 85091 | 85092 | 85093 | 85094 | 85095 | 85096