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

Merge pull request #11122 from annando/drop-order

Browse source 
Issue 11120: Delete tables in the correct order
This commit is contained in:
Tobias Diekershoff 2021-12-26 08:30:18 +01:00 committed by GitHub
commit 04dfcaf511
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Database/DBStructure.php
View file

@ -82,7 +82,7 @@ class DBStructure
$old_tables = ['fserver', 'gcign', 'gcontact', 'gcontact-relation', 'gfollower' ,'glink', 'item-delivery-data', $old_tables = ['fserver', 'gcign', 'gcontact', 'gcontact-relation', 'gfollower' ,'glink', 'item-delivery-data',
'item-activity', 'item-content', 'item_id', 'participation', 'poll', 'poll_result', 'queue', 'retriever_rule', 'item-activity', 'item-content', 'item_id', 'participation', 'poll', 'poll_result', 'queue', 'retriever_rule',
'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item', 'challenge', 'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item', 'challenge',
'auth_codes', 'clients', 'tokens', 'profile_check', 'host']; 'auth_codes', 'tokens', 'clients', 'profile_check', 'host'];
$tables = DBA::selectToArray(['INFORMATION_SCHEMA' => 'TABLES'], ['TABLE_NAME'], $tables = DBA::selectToArray(['INFORMATION_SCHEMA' => 'TABLES'], ['TABLE_NAME'],
['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']); ['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']);
@ -96,10 +96,10 @@ class DBStructure
echo DI::l10n()->t('These tables are not used for friendica and will be deleted when you execute "dbstructure drop -e":') . "\n\n"; echo DI::l10n()->t('These tables are not used for friendica and will be deleted when you execute "dbstructure drop -e":') . "\n\n";
} }
foreach ($tables as $table) { foreach ($old_tables as $table) {
if (in_array($table['TABLE_NAME'], $old_tables)) { if (in_array($table, array_column($tables, 'TABLE_NAME'))) {
if ($execute) { if ($execute) {
$sql = 'DROP TABLE ' . DBA::quoteIdentifier($table['TABLE_NAME']) . ';'; $sql = 'DROP TABLE ' . DBA::quoteIdentifier($table) . ';';
echo $sql . "\n"; echo $sql . "\n";
$result = DBA::e($sql); $result = DBA::e($sql);
@ -107,7 +107,7 @@ class DBStructure
self::printUpdateError($sql); self::printUpdateError($sql);
} }
} else { } else {
echo $table['TABLE_NAME'] . "\n"; echo $table . "\n";
} }
} }
} }