From bb52911d1604e3e01731861cbe196fdc93e33ce0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 10 Nov 2020 09:34:57 +0100 Subject: [PATCH] Create primary keys on all tables and add a command to create the afterwards Signed-off-by: Joas Schilling --- .../Version1010Date20200630191755.php | 3 +- .../lib/Controller/CheckSetupController.php | 11 ++ .../Controller/CheckSetupControllerTest.php | 5 + core/Application.php | 58 ++++++ core/Command/Db/AddMissingPrimaryKeys.php | 181 ++++++++++++++++++ .../Version13000Date20170718121200.php | 6 +- .../Version16000Date20190207141427.php | 6 +- .../Version17000Date20190514105811.php | 3 +- .../Version18000Date20191204114856.php | 1 - core/js/setupchecks.js | 15 ++ core/js/tests/specs/setupchecksSpec.js | 16 ++ lib/composer/composer/autoload_classmap.php | 2 + lib/composer/composer/autoload_static.php | 2 + .../DB/MissingPrimaryKeyInformation.php | 42 ++++ lib/public/IDBConnection.php | 2 + version.php | 2 +- 16 files changed, 347 insertions(+), 8 deletions(-) create mode 100644 core/Command/Db/AddMissingPrimaryKeys.php create mode 100644 lib/private/DB/MissingPrimaryKeyInformation.php diff --git a/apps/federatedfilesharing/lib/Migration/Version1010Date20200630191755.php b/apps/federatedfilesharing/lib/Migration/Version1010Date20200630191755.php index 53348d8f86..bf0d0f8eec 100644 --- a/apps/federatedfilesharing/lib/Migration/Version1010Date20200630191755.php +++ b/apps/federatedfilesharing/lib/Migration/Version1010Date20200630191755.php @@ -52,7 +52,8 @@ class Version1010Date20200630191755 extends SimpleMigrationStep { 'notnull' => true, 'length' => 4, ]); - $table->addUniqueIndex(['share_id'], 'share_id_index'); + $table->setPrimaryKey(['share_id'], 'federated_res_pk'); +// $table->addUniqueIndex(['share_id'], 'share_id_index'); } return $schema; } diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 0c3d17d31e..db8df5eb3e 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -49,6 +49,7 @@ use OC\AppFramework\Http; use OC\DB\Connection; use OC\DB\MissingColumnInformation; use OC\DB\MissingIndexInformation; +use OC\DB\MissingPrimaryKeyInformation; use OC\DB\SchemaWrapper; use OC\IntegrityCheck\Checker; use OC\Lock\NoopLockingProvider; @@ -451,6 +452,15 @@ Raw output return $indexInfo->getListOfMissingIndexes(); } + protected function hasMissingPrimaryKeys(): array { + $info = new MissingPrimaryKeyInformation(); + // Dispatch event so apps can also hint for pending index updates if needed + $event = new GenericEvent($info); + $this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT, $event); + + return $info->getListOfMissingPrimaryKeys(); + } + protected function hasMissingColumns(): array { $indexInfo = new MissingColumnInformation(); // Dispatch event so apps can also hint for pending index updates if needed @@ -719,6 +729,7 @@ Raw output 'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'), 'isSettimelimitAvailable' => $this->isSettimelimitAvailable(), 'hasFreeTypeSupport' => $this->hasFreeTypeSupport(), + 'missingPrimaryKeys' => $this->hasMissingPrimaryKeys(), 'missingIndexes' => $this->hasMissingIndexes(), 'missingColumns' => $this->hasMissingColumns(), 'isSqliteUsed' => $this->isSqliteUsed(), diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php index 819c8edcca..36552a894b 100644 --- a/apps/settings/tests/Controller/CheckSetupControllerTest.php +++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php @@ -165,6 +165,7 @@ class CheckSetupControllerTest extends TestCase { 'isOpcacheProperlySetup', 'hasFreeTypeSupport', 'hasMissingIndexes', + 'hasMissingPrimaryKeys', 'isSqliteUsed', 'isPHPMailerUsed', 'hasOpcacheLoaded', @@ -444,6 +445,9 @@ class CheckSetupControllerTest extends TestCase { $this->checkSetupController ->method('hasMissingIndexes') ->willReturn([]); + $this->checkSetupController + ->method('hasMissingPrimaryKeys') + ->willReturn([]); $this->checkSetupController ->method('isSqliteUsed') ->willReturn(false); @@ -587,6 +591,7 @@ class CheckSetupControllerTest extends TestCase { 'isSqliteUsed' => false, 'databaseConversionDocumentation' => 'http://docs.example.org/server/go.php?to=admin-db-conversion', 'missingIndexes' => [], + 'missingPrimaryKeys' => [], 'missingColumns' => [], 'isPHPMailerUsed' => false, 'mailSettingsDocumentation' => 'https://server/index.php/settings/admin', diff --git a/core/Application.php b/core/Application.php index 9f0fa4092a..f105dfd25d 100644 --- a/core/Application.php +++ b/core/Application.php @@ -42,6 +42,7 @@ use OC\Authentication\Notifications\Notifier as AuthenticationNotifier; use OC\Core\Notification\RemoveLinkSharesNotifier; use OC\DB\MissingColumnInformation; use OC\DB\MissingIndexInformation; +use OC\DB\MissingPrimaryKeyInformation; use OC\DB\SchemaWrapper; use OCP\AppFramework\App; use OCP\EventDispatcher\IEventDispatcher; @@ -177,6 +178,63 @@ class Application extends App { } ); + $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT, + function (GenericEvent $event) use ($container) { + /** @var MissingPrimaryKeyInformation $subject */ + $subject = $event->getSubject(); + + $schema = new SchemaWrapper($container->query(IDBConnection::class)); + + if ($schema->hasTable('federated_reshares')) { + $table = $schema->getTable('federated_reshares'); + + if (!$table->hasPrimaryKey()) { + $subject->addHintForMissingSubject($table->getName()); + } + } + + if ($schema->hasTable('systemtag_object_mapping')) { + $table = $schema->getTable('systemtag_object_mapping'); + + if (!$table->hasPrimaryKey()) { + $subject->addHintForMissingSubject($table->getName()); + } + } + + if ($schema->hasTable('comments_read_markers')) { + $table = $schema->getTable('comments_read_markers'); + + if (!$table->hasPrimaryKey()) { + $subject->addHintForMissingSubject($table->getName()); + } + } + + if ($schema->hasTable('collres_resources')) { + $table = $schema->getTable('collres_resources'); + + if (!$table->hasPrimaryKey()) { + $subject->addHintForMissingSubject($table->getName()); + } + } + + if ($schema->hasTable('collres_accesscache')) { + $table = $schema->getTable('collres_accesscache'); + + if (!$table->hasPrimaryKey()) { + $subject->addHintForMissingSubject($table->getName()); + } + } + + if ($schema->hasTable('filecache_extended')) { + $table = $schema->getTable('filecache_extended'); + + if (!$table->hasPrimaryKey()) { + $subject->addHintForMissingSubject($table->getName()); + } + } + } + ); + $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT, function (GenericEvent $event) use ($container) { /** @var MissingColumnInformation $subject */ diff --git a/core/Command/Db/AddMissingPrimaryKeys.php b/core/Command/Db/AddMissingPrimaryKeys.php new file mode 100644 index 0000000000..a51249b1b8 --- /dev/null +++ b/core/Command/Db/AddMissingPrimaryKeys.php @@ -0,0 +1,181 @@ + + * + * @author Bjoern Schiessle + * @author Joas Schilling + * @author Mario Danic + * @author Morris Jobke + * @author Robin Appelman + * @author Roeland Jago Douma + * @author Thomas Citharel + * + * @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 . + * + */ + +namespace OC\Core\Command\Db; + +use OC\DB\SchemaWrapper; +use OCP\IDBConnection; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\EventDispatcher\GenericEvent; + +/** + * Class AddMissingPrimaryKeys + * + * if you added primary keys to the database, this is the right place to add + * your update routine for existing instances + * + * @package OC\Core\Command\Db + */ +class AddMissingPrimaryKeys extends Command { + + /** @var IDBConnection */ + private $connection; + + /** @var EventDispatcherInterface */ + private $dispatcher; + + public function __construct(IDBConnection $connection, EventDispatcherInterface $dispatcher) { + parent::__construct(); + + $this->connection = $connection; + $this->dispatcher = $dispatcher; + } + + protected function configure() { + $this + ->setName('db:add-missing-primary-keys') + ->setDescription('Add missing primary keys to the database tables'); + } + + protected function execute(InputInterface $input, OutputInterface $output): int { + $this->addCorePrimaryKeys($output); + + // Dispatch event so apps can also update indexes if needed + $event = new GenericEvent($output); + $this->dispatcher->dispatch(IDBConnection::ADD_MISSING_PRIMARY_KEYS_EVENT, $event); + return 0; + } + + /** + * add missing indices to the share table + * + * @param OutputInterface $output + * @throws \Doctrine\DBAL\Schema\SchemaException + */ + private function addCorePrimaryKeys(OutputInterface $output) { + $output->writeln('Check primary keys.'); + + $schema = new SchemaWrapper($this->connection); + $updated = false; + + if ($schema->hasTable('federated_reshares')) { + $table = $schema->getTable('federated_reshares'); + if (!$table->hasPrimaryKey()) { + $output->writeln('Adding primary key to the federated_reshares table, this can take some time...'); + $table->setPrimaryKey(['share_id'], 'federated_res_pk'); + if ($table->hasIndex('share_id_index')) { + $table->dropIndex('share_id_index'); + } + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('federated_reshares table updated successfully.'); + } + } + + if ($schema->hasTable('systemtag_object_mapping')) { + $table = $schema->getTable('systemtag_object_mapping'); + if (!$table->hasPrimaryKey()) { + $output->writeln('Adding primary key to the systemtag_object_mapping table, this can take some time...'); + $table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk'); + if ($table->hasIndex('mapping')) { + $table->dropIndex('mapping'); + } + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('systemtag_object_mapping table updated successfully.'); + } + } + + if ($schema->hasTable('comments_read_markers')) { + $table = $schema->getTable('comments_read_markers'); + if (!$table->hasPrimaryKey()) { + $output->writeln('Adding primary key to the comments_read_markers table, this can take some time...'); + $table->setPrimaryKey(['user_id', 'object_type', 'object_id'], 'crm_pk'); + if ($table->hasIndex('comments_marker_index')) { + $table->dropIndex('comments_marker_index'); + } + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('comments_read_markers table updated successfully.'); + } + } + + if ($schema->hasTable('collres_resources')) { + $table = $schema->getTable('collres_resources'); + if (!$table->hasPrimaryKey()) { + $output->writeln('Adding primary key to the collres_resources table, this can take some time...'); + $table->setPrimaryKey(['collection_id', 'resource_type', 'resource_id'], 'crr_pk'); + if ($table->hasIndex('collres_unique_res')) { + $table->dropIndex('collres_unique_res'); + } + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('collres_resources table updated successfully.'); + } + } + + if ($schema->hasTable('collres_accesscache')) { + $table = $schema->getTable('collres_accesscache'); + if (!$table->hasPrimaryKey()) { + $output->writeln('Adding primary key to the collres_accesscache table, this can take some time...'); + $table->setPrimaryKey(['user_id', 'collection_id', 'resource_type', 'resource_id'], 'cra_pk'); + if ($table->hasIndex('collres_unique_user')) { + $table->dropIndex('collres_unique_user'); + } + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('collres_accesscache table updated successfully.'); + } + } + + if ($schema->hasTable('filecache_extended')) { + $table = $schema->getTable('filecache_extended'); + if (!$table->hasPrimaryKey()) { + $output->writeln('Adding primary key to the filecache_extended table, this can take some time...'); + $table->setPrimaryKey(['fileid'], 'fce_pk'); + if ($table->hasIndex('fce_fileid_idx')) { + $table->dropIndex('fce_fileid_idx'); + } + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('filecache_extended table updated successfully.'); + } + } + + if (!$updated) { + $output->writeln('Done.'); + } + } +} diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index ae4b34ec9f..6b252d8b83 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -672,7 +672,8 @@ class Version13000Date20170718121200 extends SimpleMigrationStep { 'default' => 0, 'unsigned' => true, ]); - $table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping'); + $table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk'); +// $table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping'); } if (!$schema->hasTable('systemtag_group')) { @@ -807,7 +808,8 @@ class Version13000Date20170718121200 extends SimpleMigrationStep { 'default' => '', ]); $table->addIndex(['object_type', 'object_id'], 'comments_marker_object_index'); - $table->addUniqueIndex(['user_id', 'object_type', 'object_id'], 'comments_marker_index'); + $table->setPrimaryKey(['user_id', 'object_type', 'object_id'], 'crm_pk'); +// $table->addUniqueIndex(['user_id', 'object_type', 'object_id'], 'comments_marker_index'); } // if (!$schema->hasTable('credentials')) { diff --git a/core/Migrations/Version16000Date20190207141427.php b/core/Migrations/Version16000Date20190207141427.php index 63c6c871ea..77a41dc3c4 100644 --- a/core/Migrations/Version16000Date20190207141427.php +++ b/core/Migrations/Version16000Date20190207141427.php @@ -77,7 +77,8 @@ class Version16000Date20190207141427 extends SimpleMigrationStep { 'length' => 64, ]); - $table->addUniqueIndex(['collection_id', 'resource_type', 'resource_id'], 'collres_unique_res'); + $table->setPrimaryKey(['collection_id', 'resource_type', 'resource_id'], 'crr_pk'); +// $table->addUniqueIndex(['collection_id', 'resource_type', 'resource_id'], 'collres_unique_res'); } if (!$schema->hasTable('collres_accesscache')) { @@ -106,7 +107,8 @@ class Version16000Date20190207141427 extends SimpleMigrationStep { 'default' => 0, ]); - $table->addUniqueIndex(['user_id', 'collection_id', 'resource_type', 'resource_id'], 'collres_unique_user'); + $table->setPrimaryKey(['user_id', 'collection_id', 'resource_type', 'resource_id'], 'cra_pk'); +// $table->addUniqueIndex(['user_id', 'collection_id', 'resource_type', 'resource_id'], 'collres_unique_user'); $table->addIndex(['user_id', 'resource_type', 'resource_id'], 'collres_user_res'); $table->addIndex(['user_id', 'collection_id'], 'collres_user_coll'); } diff --git a/core/Migrations/Version17000Date20190514105811.php b/core/Migrations/Version17000Date20190514105811.php index 910d821607..bd6ab1bc8a 100644 --- a/core/Migrations/Version17000Date20190514105811.php +++ b/core/Migrations/Version17000Date20190514105811.php @@ -67,7 +67,8 @@ class Version17000Date20190514105811 extends SimpleMigrationStep { 'length' => 20, 'default' => 0, ]); - $table->addUniqueIndex(['fileid'], 'fce_fileid_idx'); + $table->setPrimaryKey(['fileid'], 'fce_pk'); +// $table->addUniqueIndex(['fileid'], 'fce_fileid_idx'); $table->addIndex(['creation_time'], 'fce_ctime_idx'); $table->addIndex(['upload_time'], 'fce_utime_idx'); } diff --git a/core/Migrations/Version18000Date20191204114856.php b/core/Migrations/Version18000Date20191204114856.php index e9bf1221db..0e5f3cbe27 100644 --- a/core/Migrations/Version18000Date20191204114856.php +++ b/core/Migrations/Version18000Date20191204114856.php @@ -58,7 +58,6 @@ class Version18000Date20191204114856 extends SimpleMigrationStep { 'length' => 4000, ]); - return $schema; } } diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index 4773a20153..1541729eb8 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -357,6 +357,21 @@ type: OC.SetupChecks.MESSAGE_TYPE_INFO }) } + if (data.missingPrimaryKeys.length > 0) { + var listOfMissingPrimaryKeys = ""; + data.missingPrimaryKeys.forEach(function(element){ + listOfMissingPrimaryKeys += "
  • "; + listOfMissingPrimaryKeys += t('core', 'Missing primary key on table "{tableName}".', element); + listOfMissingPrimaryKeys += "
    • "; + }); + 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.' + ) + "
      " + listOfMissingPrimaryKeys + "
    ", + type: OC.SetupChecks.MESSAGE_TYPE_INFO + }) + } if (data.missingColumns.length > 0) { var listOfMissingColumns = ""; data.missingColumns.forEach(function(element){ diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index f4c81c6bf7..3b54a3ff66 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -240,6 +240,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -294,6 +295,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -349,6 +351,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -402,6 +405,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -453,6 +457,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -504,6 +509,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -557,6 +563,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -608,6 +615,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: false, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -659,6 +667,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -731,6 +740,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -783,6 +793,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -835,6 +846,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -887,6 +899,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: false, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -938,6 +951,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -989,6 +1003,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { @@ -1041,6 +1056,7 @@ describe('OC.SetupChecks tests', function() { isSettimelimitAvailable: true, hasFreeTypeSupport: true, missingIndexes: [], + missingPrimaryKeys: [], missingColumns: [], cronErrors: [], cronInfo: { diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index c214e42c61..55994589b3 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -796,6 +796,7 @@ return array( 'OC\\Core\\Command\\Config\\System\\SetConfig' => $baseDir . '/core/Command/Config/System/SetConfig.php', 'OC\\Core\\Command\\Db\\AddMissingColumns' => $baseDir . '/core/Command/Db/AddMissingColumns.php', 'OC\\Core\\Command\\Db\\AddMissingIndices' => $baseDir . '/core/Command/Db/AddMissingIndices.php', + 'OC\\Core\\Command\\Db\\AddMissingPrimaryKeys' => $baseDir . '/core/Command/Db/AddMissingPrimaryKeys.php', 'OC\\Core\\Command\\Db\\ConvertFilecacheBigInt' => $baseDir . '/core/Command/Db/ConvertFilecacheBigInt.php', 'OC\\Core\\Command\\Db\\ConvertMysqlToMB4' => $baseDir . '/core/Command/Db/ConvertMysqlToMB4.php', 'OC\\Core\\Command\\Db\\ConvertType' => $baseDir . '/core/Command/Db/ConvertType.php', @@ -939,6 +940,7 @@ return array( 'OC\\DB\\Migrator' => $baseDir . '/lib/private/DB/Migrator.php', 'OC\\DB\\MissingColumnInformation' => $baseDir . '/lib/private/DB/MissingColumnInformation.php', 'OC\\DB\\MissingIndexInformation' => $baseDir . '/lib/private/DB/MissingIndexInformation.php', + 'OC\\DB\\MissingPrimaryKeyInformation' => $baseDir . '/lib/private/DB/MissingPrimaryKeyInformation.php', 'OC\\DB\\MySQLMigrator' => $baseDir . '/lib/private/DB/MySQLMigrator.php', 'OC\\DB\\MySqlTools' => $baseDir . '/lib/private/DB/MySqlTools.php', 'OC\\DB\\OCSqlitePlatform' => $baseDir . '/lib/private/DB/OCSqlitePlatform.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 328c580e88..8bf9bc42b3 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -825,6 +825,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Core\\Command\\Config\\System\\SetConfig' => __DIR__ . '/../../..' . '/core/Command/Config/System/SetConfig.php', 'OC\\Core\\Command\\Db\\AddMissingColumns' => __DIR__ . '/../../..' . '/core/Command/Db/AddMissingColumns.php', 'OC\\Core\\Command\\Db\\AddMissingIndices' => __DIR__ . '/../../..' . '/core/Command/Db/AddMissingIndices.php', + 'OC\\Core\\Command\\Db\\AddMissingPrimaryKeys' => __DIR__ . '/../../..' . '/core/Command/Db/AddMissingPrimaryKeys.php', 'OC\\Core\\Command\\Db\\ConvertFilecacheBigInt' => __DIR__ . '/../../..' . '/core/Command/Db/ConvertFilecacheBigInt.php', 'OC\\Core\\Command\\Db\\ConvertMysqlToMB4' => __DIR__ . '/../../..' . '/core/Command/Db/ConvertMysqlToMB4.php', 'OC\\Core\\Command\\Db\\ConvertType' => __DIR__ . '/../../..' . '/core/Command/Db/ConvertType.php', @@ -968,6 +969,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\DB\\Migrator' => __DIR__ . '/../../..' . '/lib/private/DB/Migrator.php', 'OC\\DB\\MissingColumnInformation' => __DIR__ . '/../../..' . '/lib/private/DB/MissingColumnInformation.php', 'OC\\DB\\MissingIndexInformation' => __DIR__ . '/../../..' . '/lib/private/DB/MissingIndexInformation.php', + 'OC\\DB\\MissingPrimaryKeyInformation' => __DIR__ . '/../../..' . '/lib/private/DB/MissingPrimaryKeyInformation.php', 'OC\\DB\\MySQLMigrator' => __DIR__ . '/../../..' . '/lib/private/DB/MySQLMigrator.php', 'OC\\DB\\MySqlTools' => __DIR__ . '/../../..' . '/lib/private/DB/MySqlTools.php', 'OC\\DB\\OCSqlitePlatform' => __DIR__ . '/../../..' . '/lib/private/DB/OCSqlitePlatform.php', diff --git a/lib/private/DB/MissingPrimaryKeyInformation.php b/lib/private/DB/MissingPrimaryKeyInformation.php new file mode 100644 index 0000000000..c6b81ddba4 --- /dev/null +++ b/lib/private/DB/MissingPrimaryKeyInformation.php @@ -0,0 +1,42 @@ + + * + * @author Morris Jobke + * @author Roeland Jago Douma + * + * @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 . + * + */ + +namespace OC\DB; + +class MissingPrimaryKeyInformation { + private $listOfMissingPrimaryKeys = []; + + public function addHintForMissingSubject(string $tableName) { + $this->listOfMissingPrimaryKeys[] = [ + 'tableName' => $tableName, + ]; + } + + public function getListOfMissingPrimaryKeys(): array { + return $this->listOfMissingPrimaryKeys; + } +} diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php index 4605a051e8..07f22d39fa 100644 --- a/lib/public/IDBConnection.php +++ b/lib/public/IDBConnection.php @@ -50,6 +50,8 @@ use OCP\DB\QueryBuilder\IQueryBuilder; interface IDBConnection { public const ADD_MISSING_INDEXES_EVENT = self::class . '::ADD_MISSING_INDEXES'; public const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES'; + public const ADD_MISSING_PRIMARY_KEYS_EVENT = self::class . '::ADD_MISSING_PRIMARY_KEYS'; + public const CHECK_MISSING_PRIMARY_KEYS_EVENT = self::class . '::CHECK_MISSING_PRIMARY_KEYS'; public const ADD_MISSING_COLUMNS_EVENT = self::class . '::ADD_MISSING_COLUMNS'; public const CHECK_MISSING_COLUMNS_EVENT = self::class . '::CHECK_MISSING_COLUMNS'; diff --git a/version.php b/version.php index 60bb166006..a1e99bbbd7 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = [20, 0, 1, 5]; +$OC_Version = [20, 0, 1, 6]; // The human readable string $OC_VersionString = '20.0.1';