From 84a340a064017587dde0d8d4db346117e6dcb985 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 16 Jul 2020 10:23:56 +0000 Subject: [PATCH 1/2] Update: Don't throw an error if the target field already exists --- update.php | 1 + 1 file changed, 1 insertion(+) diff --git a/update.php b/update.php index 83011108b5..1448d818c8 100644 --- a/update.php +++ b/update.php @@ -513,6 +513,7 @@ function update_1351() function pre_update_1354() { if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist']) + && !DBStructure::existsColumn('contact', ['ffi_keyword_denylist']) && !DBA::e("ALTER TABLE `contact` CHANGE `ffi_keyword_blacklist` `ffi_keyword_denylist` text null")) { return Update::FAILED; } From bc5c19192d3703972100f31cd9f3543c0a287446 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 16 Jul 2020 18:30:20 +0000 Subject: [PATCH 2/2] Adding a post update to clean up the contact table --- update.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/update.php b/update.php index 1448d818c8..3e74efd29f 100644 --- a/update.php +++ b/update.php @@ -517,6 +517,21 @@ function pre_update_1354() && !DBA::e("ALTER TABLE `contact` CHANGE `ffi_keyword_blacklist` `ffi_keyword_denylist` text null")) { return Update::FAILED; } - + return Update::SUCCESS; +} + +function update_1354() +{ + if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist']) + && DBStructure::existsColumn('contact', ['ffi_keyword_denylist'])) { + if (!DBA::e("UPDATE `contact` SET `ffi_keyword_denylist` = `ffi_keyword_blacklist`")) { + return Update::FAILED; + } + + // When the data had been copied then the main task is done. + // Having the old field removed is only beauty but not crucial. + // So we don't care if this was successful or not. + DBA::e("ALTER TABLE `contact` DROP `ffi_keyword_blacklist`"); + } return Update::SUCCESS; }