Skip to content

Commit

Permalink
Migrate missing primary key database check to new API
Browse files Browse the repository at this point in the history
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
  • Loading branch information
come-nc authored and backportbot-nextcloud[bot] committed Dec 4, 2023
1 parent e48e67b commit fc2467c
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 60 deletions.
1 change: 1 addition & 0 deletions apps/settings/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
'OCA\\Settings\\SetupChecks\\CheckUserCertificates' => $baseDir . '/../lib/SetupChecks/CheckUserCertificates.php',
'OCA\\Settings\\SetupChecks\\DatabaseHasMissingColumns' => $baseDir . '/../lib/SetupChecks/DatabaseHasMissingColumns.php',
'OCA\\Settings\\SetupChecks\\DatabaseHasMissingIndices' => $baseDir . '/../lib/SetupChecks/DatabaseHasMissingIndices.php',
'OCA\\Settings\\SetupChecks\\DatabaseHasMissingPrimaryKeys' => $baseDir . '/../lib/SetupChecks/DatabaseHasMissingPrimaryKeys.php',
'OCA\\Settings\\SetupChecks\\DefaultPhoneRegionSet' => $baseDir . '/../lib/SetupChecks/DefaultPhoneRegionSet.php',
'OCA\\Settings\\SetupChecks\\EmailTestSuccessful' => $baseDir . '/../lib/SetupChecks/EmailTestSuccessful.php',
'OCA\\Settings\\SetupChecks\\FileLocking' => $baseDir . '/../lib/SetupChecks/FileLocking.php',
Expand Down
1 change: 1 addition & 0 deletions apps/settings/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ class ComposerStaticInitSettings
'OCA\\Settings\\SetupChecks\\CheckUserCertificates' => __DIR__ . '/..' . '/../lib/SetupChecks/CheckUserCertificates.php',
'OCA\\Settings\\SetupChecks\\DatabaseHasMissingColumns' => __DIR__ . '/..' . '/../lib/SetupChecks/DatabaseHasMissingColumns.php',
'OCA\\Settings\\SetupChecks\\DatabaseHasMissingIndices' => __DIR__ . '/..' . '/../lib/SetupChecks/DatabaseHasMissingIndices.php',
'OCA\\Settings\\SetupChecks\\DatabaseHasMissingPrimaryKeys' => __DIR__ . '/..' . '/../lib/SetupChecks/DatabaseHasMissingPrimaryKeys.php',
'OCA\\Settings\\SetupChecks\\DefaultPhoneRegionSet' => __DIR__ . '/..' . '/../lib/SetupChecks/DefaultPhoneRegionSet.php',
'OCA\\Settings\\SetupChecks\\EmailTestSuccessful' => __DIR__ . '/..' . '/../lib/SetupChecks/EmailTestSuccessful.php',
'OCA\\Settings\\SetupChecks\\FileLocking' => __DIR__ . '/..' . '/../lib/SetupChecks/FileLocking.php',
Expand Down
2 changes: 2 additions & 0 deletions apps/settings/lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
use OCA\Settings\SetupChecks\CheckUserCertificates;
use OCA\Settings\SetupChecks\DatabaseHasMissingColumns;
use OCA\Settings\SetupChecks\DatabaseHasMissingIndices;
use OCA\Settings\SetupChecks\DatabaseHasMissingPrimaryKeys;
use OCA\Settings\SetupChecks\DefaultPhoneRegionSet;
use OCA\Settings\SetupChecks\EmailTestSuccessful;
use OCA\Settings\SetupChecks\FileLocking;
Expand Down Expand Up @@ -164,6 +165,7 @@ public function register(IRegistrationContext $context): void {
$context->registerSetupCheck(CheckUserCertificates::class);
$context->registerSetupCheck(DatabaseHasMissingColumns::class);
$context->registerSetupCheck(DatabaseHasMissingIndices::class);
$context->registerSetupCheck(DatabaseHasMissingPrimaryKeys::class);
$context->registerSetupCheck(DefaultPhoneRegionSet::class);
$context->registerSetupCheck(EmailTestSuccessful::class);
$context->registerSetupCheck(FileLocking::class);
Expand Down
25 changes: 0 additions & 25 deletions apps/settings/lib/Controller/CheckSetupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
use OC;
use OC\AppFramework\Http;
use OC\DB\Connection;
use OC\DB\MissingPrimaryKeyInformation;
use OC\DB\SchemaWrapper;
use OC\IntegrityCheck\Checker;
use OCP\App\IAppManager;
Expand All @@ -60,7 +59,6 @@
use OCP\AppFramework\Http\DataDisplayResponse;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\DB\Events\AddMissingPrimaryKeyEvent;
use OCP\DB\Types;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Http\Client\IClientService;
Expand Down Expand Up @@ -415,28 +413,6 @@ protected function getOpcacheSetupRecommendations(): array {
return $recommendations;
}

protected function hasMissingPrimaryKeys(): array {
$info = new MissingPrimaryKeyInformation();
// Dispatch event so apps can also hint for pending key updates if needed
$event = new AddMissingPrimaryKeyEvent();
$this->dispatcher->dispatchTyped($event);
$missingKeys = $event->getMissingPrimaryKeys();

if (!empty($missingKeys)) {
$schema = new SchemaWrapper(\OCP\Server::get(Connection::class));
foreach ($missingKeys as $missingKey) {
if ($schema->hasTable($missingKey['tableName'])) {
$table = $schema->getTable($missingKey['tableName']);
if (!$table->hasPrimaryKey()) {
$info->addHintForMissingSubject($missingKey['tableName']);
}
}
}
}

return $info->getListOfMissingPrimaryKeys();
}

protected function isSqliteUsed() {
return str_contains($this->config->getSystemValue('dbtype'), 'sqlite');
}
Expand Down Expand Up @@ -653,7 +629,6 @@ public function check() {
'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
'OpcacheSetupRecommendations' => $this->getOpcacheSetupRecommendations(),
'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
'missingPrimaryKeys' => $this->hasMissingPrimaryKeys(),
'isSqliteUsed' => $this->isSqliteUsed(),
'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(),
Expand Down
89 changes: 89 additions & 0 deletions apps/settings/lib/SetupChecks/DatabaseHasMissingPrimaryKeys.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?php

declare(strict_types=1);

/**
* @copyright Copyright (c) 2023 Côme Chilliet <come.chilliet@nextcloud.com>
*
* @author Côme Chilliet <come.chilliet@nextcloud.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Settings\SetupChecks;

use OC\DB\Connection;
use OC\DB\MissingPrimaryKeyInformation;
use OC\DB\SchemaWrapper;
use OCP\DB\Events\AddMissingPrimaryKeyEvent;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IL10N;
use OCP\SetupCheck\ISetupCheck;
use OCP\SetupCheck\SetupResult;

class DatabaseHasMissingPrimaryKeys implements ISetupCheck {
public function __construct(
private IL10N $l10n,
private Connection $connection,
private IEventDispatcher $dispatcher,
) {
}

public function getCategory(): string {
return 'database';
}

public function getName(): string {
return $this->l10n->t('Database missing primary keys');
}

private function getMissingPrimaryKeys(): array {
$primaryKeyInfo = new MissingPrimaryKeyInformation();
// Dispatch event so apps can also hint for pending primary key updates if needed
$event = new AddMissingPrimaryKeyEvent();
$this->dispatcher->dispatchTyped($event);
$missingPrimaryKeys = $event->getMissingPrimaryKeys();

if (!empty($missingPrimaryKeys)) {
$schema = new SchemaWrapper($this->connection);
foreach ($missingPrimaryKeys as $missingPrimaryKey) {
if ($schema->hasTable($missingPrimaryKey['tableName'])) {
$table = $schema->getTable($missingPrimaryKey['tableName']);
if (!$table->hasPrimaryKey()) {
$primaryKeyInfo->addHintForMissingPrimaryKey($missingPrimaryKey['tableName']);
}
}
}
}

return $primaryKeyInfo->getListOfMissingPrimaryKeys();
}

public function run(): SetupResult {
$missingPrimaryKeys = $this->getMissingPrimaryKeys();
if (empty($missingPrimaryKeys)) {
return SetupResult::success('None');
} else {
$list = '';
foreach ($missingPrimaryKeys as $missingPrimaryKey) {
$list .= "\n".$this->l10n->t('Missing primary key on table "%s".', [$missingPrimaryKey['tableName']]);
}
return SetupResult::info(
$this->l10n->t('The database is missing some primary keys. Due to the fact that adding primary keys on big tables could take some time they were not added automatically. By running "occ db:add-missing-primary-keys" those missing primary keys could be added manually while the instance keeps running.').$list
);
}
}
}
4 changes: 0 additions & 4 deletions apps/settings/tests/Controller/CheckSetupControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ protected function setUp(): void {
'getCurlVersion',
'isPhpOutdated',
'getOpcacheSetupRecommendations',
'hasMissingPrimaryKeys',
'isSqliteUsed',
'isPHPMailerUsed',
'getAppDirsWithDifferentOwner',
Expand Down Expand Up @@ -228,9 +227,6 @@ public function testCheck() {
->expects($this->once())
->method('getOpcacheSetupRecommendations')
->willReturn(['recommendation1', 'recommendation2']);
$this->checkSetupController
->method('hasMissingPrimaryKeys')
->willReturn([]);
$this->checkSetupController
->method('isSqliteUsed')
->willReturn(false);
Expand Down
12 changes: 0 additions & 12 deletions core/js/setupchecks.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,18 +258,6 @@
type: OC.SetupChecks.MESSAGE_TYPE_WARNING
});
}
if (data.missingPrimaryKeys.length > 0) {
var listOfMissingPrimaryKeys = "";
data.missingPrimaryKeys.forEach(function(element){
listOfMissingPrimaryKeys += '<li>';
listOfMissingPrimaryKeys += t('core', 'Missing primary key on table "{tableName}".', element);
listOfMissingPrimaryKeys += '</li>';
});
messages.push({
msg: t('core', 'The database is missing some primary keys. Due to the fact that adding primary keys on big tables could take some time they were not added automatically. By running "occ db:add-missing-primary-keys" those missing primary keys could be added manually while the instance keeps running.') + '<ul>' + listOfMissingPrimaryKeys + '</ul>',
type: OC.SetupChecks.MESSAGE_TYPE_INFO
})
}
if (!data.isImagickEnabled) {
messages.push({
msg: t(
Expand Down
17 changes: 0 additions & 17 deletions core/js/tests/specs/setupchecksSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -280,7 +279,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -331,7 +329,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -382,7 +379,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -431,7 +427,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -483,7 +478,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: false,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -533,7 +527,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -614,7 +607,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -670,7 +662,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: ['recommendation1', 'recommendation2'],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -719,7 +710,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -772,7 +762,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -822,7 +811,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -869,7 +857,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -919,7 +906,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -969,7 +955,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -1018,7 +1003,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down Expand Up @@ -1074,7 +1058,6 @@ describe('OC.SetupChecks tests', function() {
hasPassedCodeIntegrityCheck: true,
OpcacheSetupRecommendations: [],
isSettimelimitAvailable: true,
missingPrimaryKeys: [],
cronErrors: [],
cronInfo: {
diffInSeconds: 0
Expand Down
4 changes: 2 additions & 2 deletions lib/private/DB/MissingPrimaryKeyInformation.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
namespace OC\DB;

class MissingPrimaryKeyInformation {
private $listOfMissingPrimaryKeys = [];
private array $listOfMissingPrimaryKeys = [];

public function addHintForMissingSubject(string $tableName) {
public function addHintForMissingPrimaryKey(string $tableName): void {
$this->listOfMissingPrimaryKeys[] = [
'tableName' => $tableName,
];
Expand Down

0 comments on commit fc2467c

Please sign in to comment.