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

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

1 files changed, 48 insertions, 7 deletions

diff --git a/core/Command/Db/AddMissingPrimaryKeys.php b/core/Command/Db/AddMissingPrimaryKeys.php
index a11be78ccfc..6ace85d785b 100644
--- 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;
 	}
 }