feat(dispatcher): Add typed event for "db:add-missing-primary-keys"

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index 170c6a3870a9c732bebd88862dd35fec31392d85..5d7989f02562c2f39075a3748c6dddb5247d07d1 100644 (file)
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -76,6 +76,7 @@ use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\DB\Events\AddMissingColumnsEvent;
 use OCP\DB\Events\AddMissingIndicesEvent;
+use OCP\DB\Events\AddMissingPrimaryKeyEvent;
 use OCP\DB\Types;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Http\Client\IClientService;
@@ -580,6 +581,22 @@ Raw output
                $event = new GenericEvent($info);
                $this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT, $event);
 
+               $event = new AddMissingPrimaryKeyEvent();
+               $this->eventDispatcher->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();
        }
 

diff --git a/core/Command/Db/AddMissingPrimaryKeys.php b/core/Command/Db/AddMissingPrimaryKeys.php
index a11be78ccfc71bb8fbac200b821186ba92f77319..6ace85d785b44536f3ca44fd3e2306f4883fb57a 100644 (file)
--- a/core/Command/Db/AddMissingPrimaryKeys.php
+++ b/core/Command/Db/AddMissingPrimaryKeys.php
@@ -28,6 +28,9 @@ namespace OC\Core\Command\Db;
 
 use OC\DB\Connection;
 use OC\DB\SchemaWrapper;
+use OCP\DB\Events\AddMissingColumnsEvent;
+use OCP\DB\Events\AddMissingPrimaryKeyEvent;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IDBConnection;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -35,6 +38,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
+use function Symfony\Component\Translation\t;
 
 /**
  * Class AddMissingPrimaryKeys
@@ -47,7 +51,8 @@ use Symfony\Component\EventDispatcher\GenericEvent;
 class AddMissingPrimaryKeys extends Command {
        public function __construct(
                private Connection $connection,
-               private EventDispatcherInterface $dispatcher,
+               private EventDispatcherInterface $legacyDispatcher,
+               private IEventDispatcher $dispatcher,
        ) {
                parent::__construct();
        }
@@ -60,11 +65,48 @@ class AddMissingPrimaryKeys extends Command {
        }
 
        protected function execute(InputInterface $input, OutputInterface $output): int {
-               $this->addCorePrimaryKeys($output, $input->getOption('dry-run'));
+               $dryRun = $input->getOption('dry-run');
+
+               $updated = $this->addCorePrimaryKeys($output, $dryRun);
 
                // Dispatch event so apps can also update indexes if needed
                $event = new GenericEvent($output);
-               $this->dispatcher->dispatch(IDBConnection::ADD_MISSING_PRIMARY_KEYS_EVENT, $event);
+               $this->legacyDispatcher->dispatch(IDBConnection::ADD_MISSING_PRIMARY_KEYS_EVENT, $event);
+
+               $event = new AddMissingPrimaryKeyEvent();
+               $this->dispatcher->dispatchTyped($event);
+               $missingKeys = $event->getMissingPrimaryKeys();
+
+               if (!empty($missingKeys)) {
+                       $schema = new SchemaWrapper($this->connection);
+
+                       foreach ($missingKeys as $missingKey) {
+                               if ($schema->hasTable($missingKey['tableName'])) {
+                                       $table = $schema->getTable($missingKey['tableName']);
+                                       if (!$table->hasPrimaryKey()) {
+                                               $output->writeln('<info>Adding primary key to the ' . $missingKey['tableName'] . ' table, this can take some time...</info>');
+                                               $table->setPrimaryKey($missingKey['columns'], $missingKey['primaryKeyName']);
+
+                                               if ($missingKey['formerIndex'] && $table->hasIndex($missingKey['formerIndex'])) {
+                                                       $table->dropIndex($missingKey['formerIndex']);
+                                               }
+
+                                               $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                                               if ($dryRun && $sqlQueries !== null) {
+                                                       $output->writeln($sqlQueries);
+                                               }
+
+                                               $updated = true;
+                                               $output->writeln('<info>' . $missingKey['tableName'] . ' table updated successfully.</info>');
+                                       }
+                               }
+                       }
+               }
+
+               if (!$updated) {
+                       $output->writeln('<info>Done.</info>');
+               }
+
                return 0;
        }
 
@@ -73,9 +115,10 @@ class AddMissingPrimaryKeys extends Command {
         *
         * @param OutputInterface $output
         * @param bool $dryRun If true, will return the sql queries instead of running them.
+        * @return bool True when the schema changed
         * @throws \Doctrine\DBAL\Schema\SchemaException
         */
-       private function addCorePrimaryKeys(OutputInterface $output, bool $dryRun): void {
+       private function addCorePrimaryKeys(OutputInterface $output, bool $dryRun): bool {
                $output->writeln('<info>Check primary keys.</info>');
 
                $schema = new SchemaWrapper($this->connection);
@@ -183,8 +226,6 @@ class AddMissingPrimaryKeys extends Command {
                        }
                }
 
-               if (!$updated) {
-                       $output->writeln('<info>Done.</info>');
-               }
+               return $updated;
        }
 }

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 5b89d45cdfb480cbf51435383e27407235039d4a..89ae83e83e455189cf684b51fc6137e2d9535ad5 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -212,6 +212,7 @@ return array(
     'OCP\\Contacts\\IManager' => $baseDir . '/lib/public/Contacts/IManager.php',
     'OCP\\DB\\Events\\AddMissingColumnsEvent' => $baseDir . '/lib/public/DB/Events/AddMissingColumnsEvent.php',
     'OCP\\DB\\Events\\AddMissingIndicesEvent' => $baseDir . '/lib/public/DB/Events/AddMissingIndicesEvent.php',
+    'OCP\\DB\\Events\\AddMissingPrimaryKeyEvent' => $baseDir . '/lib/public/DB/Events/AddMissingPrimaryKeyEvent.php',
     'OCP\\DB\\Exception' => $baseDir . '/lib/public/DB/Exception.php',
     'OCP\\DB\\IPreparedStatement' => $baseDir . '/lib/public/DB/IPreparedStatement.php',
     'OCP\\DB\\IResult' => $baseDir . '/lib/public/DB/IResult.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 2b71939fa6f4b4f91e0b84bcb0629fac11898ff5..0480448a1b8ef7e8cba4dcc28a7cb97088a2f232 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -245,6 +245,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\Contacts\\IManager' => __DIR__ . '/../../..' . '/lib/public/Contacts/IManager.php',
         'OCP\\DB\\Events\\AddMissingColumnsEvent' => __DIR__ . '/../../..' . '/lib/public/DB/Events/AddMissingColumnsEvent.php',
         'OCP\\DB\\Events\\AddMissingIndicesEvent' => __DIR__ . '/../../..' . '/lib/public/DB/Events/AddMissingIndicesEvent.php',
+        'OCP\\DB\\Events\\AddMissingPrimaryKeyEvent' => __DIR__ . '/../../..' . '/lib/public/DB/Events/AddMissingPrimaryKeyEvent.php',
         'OCP\\DB\\Exception' => __DIR__ . '/../../..' . '/lib/public/DB/Exception.php',
         'OCP\\DB\\IPreparedStatement' => __DIR__ . '/../../..' . '/lib/public/DB/IPreparedStatement.php',
         'OCP\\DB\\IResult' => __DIR__ . '/../../..' . '/lib/public/DB/IResult.php',

diff --git a/lib/public/DB/Events/AddMissingPrimaryKeyEvent.php b/lib/public/DB/Events/AddMissingPrimaryKeyEvent.php
new file mode 100644 (file)
index 0000000..ace55d7
--- /dev/null
+++ b/lib/public/DB/Events/AddMissingPrimaryKeyEvent.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2023 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @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 OCP\DB\Events;
+
+/**
+ * Event to allow apps to register information about missing database primary keys
+ *
+ * This event will be dispatched for checking on the admin settings and when running
+ * occ db:add-missing-primary-keys which will then create those keys
+ *
+ * @since 28.0.0
+ */
+class AddMissingPrimaryKeyEvent extends \OCP\EventDispatcher\Event {
+       /** @var array<array-key, array{tableName: string, primaryKeyName: string, columns: string[], formerIndex: null|string}> */
+       private array $missingPrimaryKeys = [];
+
+       /**
+        * @param string[] $columns
+        * @since 28.0.0
+        */
+       public function addMissingPrimaryKey(string $tableName, string $primaryKeyName, array $columns, ?string $formerIndex = null): void {
+               $this->missingPrimaryKeys[] = [
+                       'tableName' => $tableName,
+                       'primaryKeyName' => $primaryKeyName,
+                       'columns' => $columns,
+                       'formerIndex' => $formerIndex,
+               ];
+       }
+
+       /**
+        * @since 28.0.0
+        * @return array<array-key, array{tableName: string, primaryKeyName: string, columns: string[], formerIndex: null|string}>
+        */
+       public function getMissingPrimaryKeys(): array {
+               return $this->missingPrimaryKeys;
+       }
+}

diff --git a/lib/public/IDBConnection.php b/lib/public/IDBConnection.php
index bee2edad130ec15531abc5d706f44f904d977aba..7ce2537cb65c61f7e11c56da73b9db1feae5cefc 100644 (file)
--- a/lib/public/IDBConnection.php
+++ b/lib/public/IDBConnection.php
@@ -36,6 +36,7 @@ namespace OCP;
 use Doctrine\DBAL\Schema\Schema;
 use OCP\DB\Events\AddMissingColumnsEvent;
 use OCP\DB\Events\AddMissingIndicesEvent;
+use OCP\DB\Events\AddMissingPrimaryKeyEvent;
 use OCP\DB\Exception;
 use OCP\DB\IPreparedStatement;
 use OCP\DB\IResult;
@@ -58,12 +59,12 @@ interface IDBConnection {
        public const CHECK_MISSING_INDEXES_EVENT = self::class . '::CHECK_MISSING_INDEXES';
 
        /**
-        * @deprecated 22.0.0 this is an internal event
+        * @deprecated 22.0.0 this is an internal event, use {@see AddMissingPrimaryKeyEvent} instead
         */
        public const ADD_MISSING_PRIMARY_KEYS_EVENT = self::class . '::ADD_MISSING_PRIMARY_KEYS';
 
        /**
-        * @deprecated 22.0.0 this is an internal event
+        * @deprecated 22.0.0 this is an internal event, use {@see AddMissingPrimaryKeyEvent} instead
         */
        public const CHECK_MISSING_PRIMARY_KEYS_EVENT = self::class . '::CHECK_MISSING_PRIMARY_KEYS';