Attachment 110838 Details for Bug 26268 – Bug 26268: (QA follow-up) Split DB update checks

[patch] Bug 26268: (QA follow-up) Split DB update checks

Bug-26268-QA-follow-up-Split-DB-update-checks.patch (text/plain), 1.36 KB, created by Martin Renvoize (ashimema) on 2020-09-28 09:19:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-28 09:19:17 UTC

Size: 1.36 KB

patch

obsolete

>From 673e134a7a6006b4e74fe7e51eff90c276fdd65a Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 4 Sep 2020 17:04:53 +0100
>Subject: [PATCH] Bug 26268: (QA follow-up) Split DB update checks
>
>This patch splits the DB update such that the 'paidfor' field is checked
>for distinctly in the deleteditems table rather than assuming if it
>exists in the items table it will also exist in deleteditems.
>
>We also correct the check as highlights by Julian.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> installer/data/mysql/atomicupdate/bug_26268.perl | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_26268.perl b/installer/data/mysql/atomicupdate/bug_26268.perl
>index 09790bff21..a5769225e4 100644
>--- a/installer/data/mysql/atomicupdate/bug_26268.perl
>+++ b/installer/data/mysql/atomicupdate/bug_26268.perl
>@@ -1,8 +1,11 @@
> $DBversion = 'XXX'; # will be replaced by the RM
> if( CheckVersion( $DBversion ) ) {
> 
>-    if( !column_exists( 'items', 'paidfor' ) ) {
>+    if( column_exists( 'items', 'paidfor' ) ) {
>        $dbh->do(q|ALTER TABLE items DROP COLUMN paidfor|);
>+    }
>+
>+    if ( column_exists( 'deleteditems', 'paidfor' ) ) {
>        $dbh->do(q|ALTER TABLE deleteditems DROP COLUMN paidfor|);
>     }
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26268: 108797 | 108799 | 108807 | 108808 | 108809 | 108810 | 108812 | 108813 | 108814 | 109674 | 109675 | 109676 | 109677 | 109930 | 109931 | 109932 | 109933 | 109934 | 110801 | 110802 | 110803 | 110804 | 110805 | 110806 | 110836 | 110837 | 110838 | 110839 | 110840 | 110841 | 110935