Simplify the database handling

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Feb 2, 2022 · 9a190b3 · 9a190b3
1 parent 8ce7971
commit 9a190b3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 134 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -53,18 +53,14 @@ public function __construct(array $params = []) {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		$context->registerService(IActivityDBConnection::class, function (ContainerInterface $c) {
+		$context->registerService('activityDBConnection', function (ContainerInterface $c) {
 			$systemConfig = $c->get(SystemConfig::class);
 			$factory = new \OC\DB\ConnectionFactory($systemConfig);
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
 			if (!$factory->isValidType($type)) {
 				throw new \OC\DatabaseException('Invalid database type');
 			}
-			$connectionParams = $factory->createConnectionParams(
-				'activity_',
-				\OCA\Activity\DB\ActivityConnection::class,
-				\OCA\Activity\DB\ActivityOracleConnection::class
-			);
+			$connectionParams = $factory->createConnectionParams('activity_');
 			$connection = $factory->getConnection($type, $connectionParams);
 			$connection->getConfiguration()->setSQLLogger($c->get(\OCP\Diagnostics\IQueryLogger::class));
 			return $connection;

diff --git a/lib/DB/ActivityConnection.php b/lib/DB/ActivityConnection.php
diff --git a/lib/DB/ActivityConnectionAdapter.php b/lib/DB/ActivityConnectionAdapter.php
diff --git a/lib/DB/ActivityOracleConnection.php b/lib/DB/ActivityOracleConnection.php
diff --git a/lib/DB/IActivityDBConnection.php b/lib/DB/IActivityDBConnection.php
diff --git a/lib/Data.php b/lib/Data.php
@@ -44,9 +44,10 @@ class Data {
 	/** @var IDBConnection */
 	protected $connection;
 
-	public function __construct(IManager $activityManager, IActivityDBConnection $connection) {
+	// FIXME must NOT typehint IDBConnection! Otherwise IDBConnection is injected instead of our own service
+	public function __construct(IManager $activityManager, $activityDBConnection) {
 		$this->activityManager = $activityManager;
-		$this->connection = $connection;
+		$this->connection = $activityDBConnection;
 	}
 
 	/**

diff --git a/lib/MailQueueHandler.php b/lib/MailQueueHandler.php
@@ -96,7 +96,8 @@ class MailQueueHandler {
 	protected $logger;
 
 	public function __construct(IDateTimeFormatter $dateFormatter,
-								IActivityDBConnection $connection,
+								// FIXME must NOT typehint IDBConnection! Otherwise IDBConnection is injected instead of our own service
+								$activityDBConnection,
 								IMailer $mailer,
 								IURLGenerator $urlGenerator,
 								IUserManager $userManager,
@@ -106,7 +107,7 @@ public function __construct(IDateTimeFormatter $dateFormatter,
 								IConfig $config,
 								ILogger $logger) {
 		$this->dateFormatter = $dateFormatter;
-		$this->connection = $connection;
+		$this->connection = $activityDBConnection;
 		$this->mailer = $mailer;
 		$this->urlGenerator = $urlGenerator;
 		$this->userManager = $userManager;