nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8888 from annando/rename-keywordlist

Browse source 
Update: Don't throw an error if the target field already exists
This commit is contained in:
Hypolite Petovan 2020-07-16 14:56:00 -04:00 committed by GitHub
commit 8172fbe75f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
update.php
View file

@ -513,9 +513,25 @@ function update_1351()
function pre_update_1354() function pre_update_1354()
{ {
if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist']) 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")) { && !DBA::e("ALTER TABLE `contact` CHANGE `ffi_keyword_blacklist` `ffi_keyword_denylist` text null")) {
return Update::FAILED; 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; return Update::SUCCESS;
} }