tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10523 from annando/issue-10519

Browse source 
Issue 10519: check for tables and fields before applying changes
This commit is contained in:
Hypolite Petovan 2021-07-20 10:42:07 -04:00 • committed by GitHub
commit b04471b9f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
update.php
View file

@ -694,16 +694,30 @@ function update_1396()
return Update::SUCCESS;
}
if (!DBA::e("INSERT IGNORE INTO `post-content`(`uri-id`, `title`, `content-warning`, `body`, `raw-body`,
`location`, `coord`, `language`, `app`, `rendered-hash`, `rendered-html`,
`object-type`, `object`, `target-type`, `target`, `resource-id`, `plink`)
SELECT `item-content`.`uri-id`, `item-content`.`title`, `item-content`.`content-warning`,
`item-content`.`body`, `item-content`.`raw-body`, `item-content`.`location`, `item-content`.`coord`,
`item-content`.`language`, `item-content`.`app`, `item-content`.`rendered-hash`,
`item-content`.`rendered-html`, `item-content`.`object-type`, `item-content`.`object`,
`item-content`.`target-type`, `item-content`.`target`, `item`.`resource-id`, `item-content`.`plink`
FROM `item-content` INNER JOIN `item` ON `item`.`uri-id` = `item-content`.`uri-id`")) {
return Update::FAILED;
if (DBStructure::existsColumn('item-content', ['raw-body'])) {
if (!DBA::e("INSERT IGNORE INTO `post-content`(`uri-id`, `title`, `content-warning`, `body`, `raw-body`,
`location`, `coord`, `language`, `app`, `rendered-hash`, `rendered-html`,
`object-type`, `object`, `target-type`, `target`, `resource-id`, `plink`)
SELECT `item-content`.`uri-id`, `item-content`.`title`, `item-content`.`content-warning`,
`item-content`.`body`, `item-content`.`raw-body`, `item-content`.`location`, `item-content`.`coord`,
`item-content`.`language`, `item-content`.`app`, `item-content`.`rendered-hash`,
`item-content`.`rendered-html`, `item-content`.`object-type`, `item-content`.`object`,
`item-content`.`target-type`, `item-content`.`target`, `item`.`resource-id`, `item-content`.`plink`
FROM `item-content` INNER JOIN `item` ON `item`.`uri-id` = `item-content`.`uri-id`")) {
return Update::FAILED;
}
} else {
if (!DBA::e("INSERT IGNORE INTO `post-content`(`uri-id`, `title`, `content-warning`, `body`,
`location`, `coord`, `language`, `app`, `rendered-hash`, `rendered-html`,
`object-type`, `object`, `target-type`, `target`, `resource-id`, `plink`)
SELECT `item-content`.`uri-id`, `item-content`.`title`, `item-content`.`content-warning`,
`item-content`.`body`, `item-content`.`location`, `item-content`.`coord`,
`item-content`.`language`, `item-content`.`app`, `item-content`.`rendered-hash`,
`item-content`.`rendered-html`, `item-content`.`object-type`, `item-content`.`object`,
`item-content`.`target-type`, `item-content`.`target`, `item`.`resource-id`, `item-content`.`plink`
FROM `item-content` INNER JOIN `item` ON `item`.`uri-id` = `item-content`.`uri-id`")) {
return Update::FAILED;
}
}
return Update::SUCCESS;
}
@ -826,7 +840,7 @@ function update_1400()
function pre_update_1403()
{
// Necessary before a primary key change
if (!DBA::e("DROP TABLE `parsed_url`")) {
if (DBStructure::existsTable('parsed_url') && !DBA::e("DROP TABLE `parsed_url`")) {
return Update::FAILED;
}