jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved update mechanism (more error handling)

Browse source
This commit is contained in:
Michael 2020-05-10 17:37:02 +00:00
parent ecdf3b798b
commit 156712597c
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
update.php
View file

@ -435,13 +435,18 @@ function update_1347()
function pre_update_1348() function pre_update_1348()
{ {
DBA::insert('contact', ['nurl' => '']); DBA::insert('contact', ['nurl' => '']);
DBA::update('contact', ['id' => 0], ['id' => DBA::lastInsertId()]); $lastid = DBA::lastInsertId();
if ($lastid != 0) {
DBA::update('contact', ['id' => 0], ['id' => $lastid]);
}
// The tables "permissionset" and "tag" could or could not exist during the update. // The tables "permissionset" and "tag" could or could not exist during the update.
// This depends upon the previous version. Depending upon this situation we have to add // This depends upon the previous version. Depending upon this situation we have to add
// the "0" values before adding the foreign keys - or after would be sufficient. // the "0" values before adding the foreign keys - or after would be sufficient.
update_1348(); update_1348();
return Update::SUCCESS;
} }
function update_1348() function update_1348()
@ -449,11 +454,17 @@ function update_1348()
// Insert a permissionset with id=0 // Insert a permissionset with id=0
// Setting it to -1 and then changing the value to 0 tricks the auto increment // Setting it to -1 and then changing the value to 0 tricks the auto increment
DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']); DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);
DBA::update('permissionset', ['id' => 0], ['id' => DBA::lastInsertId()]); $lastid = DBA::lastInsertId();
if ($lastid != 0) {
DBA::update('permissionset', ['id' => 0], ['id' => $lastid]);
}
DBA::insert('tag', ['name' => '']); DBA::insert('tag', ['name' => '']);
DBA::update('tag', ['id' => 0], ['id' => DBA::lastInsertId()]); $lastid = DBA::lastInsertId();
if ($lastid != 0) {
DBA::update('tag', ['id' => 0], ['id' => $lastid]);
}
// to-do: Tag / contact
return Update::SUCCESS; return Update::SUCCESS;
} }