Attachment 112968 Details for Bug 26911 – Bug 26911: (bug 18936 follow-up) Remove invalid data before copying the circ rules

[patch] Bug 26911: (bug 18936 follow-up) Remove invalid data before copying the circ rules

Bug-26911-bug-18936-follow-up-Remove-invalid-data-.patch (text/plain), 1.91 KB, created by David Nind on 2020-11-04 00:25:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2020-11-04 00:25:38 UTC

Size: 1.91 KB

patch

obsolete

>From 79d5c728fbd85a6358d07e2f8d7a093087a9bec4 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 3 Nov 2020 16:45:33 +0100
>Subject: [PATCH] Bug 26911: (bug 18936 follow-up) Remove invalid data before
> copying the circ rules
>
>UPDATE: changed queries to not touch * values
>
>To test:
> 1 - Checkout 19.11.x and reset_all
> 2 - Add a new patron category, itemtype, and branch to your system
> 3 - Create issuing rules using thise 3 values, and others
> 4 - Delete the new category, itemtype and branch
> 5 - Checkout master
> 6 - Restart_all
> 7 - updatedatabase
> 8 - you get errors
> 9 - repeat 1-5
>10 - apply patch
>11 - restart_all
>12 - updatedatabase
>13 - no errors!
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> installer/data/mysql/updatedatabase.pl | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index f31a1c8fba..045a170e61 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -20707,6 +20707,21 @@ if( CheckVersion( $DBversion ) ) {
>         note
>     );
> 
>+    $dbh->do(q|
>+        DELETE i FROM issuingrules i
>+        LEFT JOIN itemtypes it ON i.itemtype=it.itemtype
>+        WHERE it.itemtype IS NULL AND i.itemtype!='*'
>+    |);
>+    $dbh->do(q|
>+        DELETE i FROM issuingrules i
>+        LEFT JOIN branches b ON i.branchcode=b.branchcode
>+        WHERE b.branchcode IS NULL AND i.branchcode!='*'
>+    |);
>+    $dbh->do(q|
>+        DELETE i FROM issuingrules i
>+        LEFT JOIN categories c ON i.categorycode=c.categorycode
>+        WHERE c.categorycode IS NULL AND i.categorycode!='*'
>+    |);
>     if ( column_exists( 'issuingrules', 'categorycode' ) ) {
>         foreach my $column ( @columns ) {
>             $dbh->do("
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26911: 112935 | 112949 | 112950 | 112968 | 113098