fix: add pending group by

JSON column with postgre need to be converted first to text to be possible use at group by Signed-off-by: Vitor Mattos <[email protected]>
LibreSign · Apr 8, 2024 · 47ab22d · 47ab22d
1 parent 88ce2ab
commit 47ab22d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/Db/SignRequestMapper.php b/lib/Db/SignRequestMapper.php
@@ -24,6 +24,7 @@
 
 namespace OCA\Libresign\Db;
 
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use OCA\Libresign\Helper\Pagination;
 use OCA\Libresign\Service\IdentifyMethod\IIdentifyMethod;
 use OCA\Libresign\Service\IdentifyMethodService;
@@ -464,6 +465,13 @@ private function getFilesAssociatedFilesWithMeQueryBuilder(string $userId, ?stri
 				'f.status',
 				'f.created_at',
 			);
+		// metadata is a json column, the right way is to use f.metadata::text
+		// when the database is PostgreSQL. The problem is that the command
+		// addGroupBy add quotes over all text send as argument. With
+		// PostgreSQL json columns don't have problem if not added to group by.
+		if (!$qb->getConnection()->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+			$qb->addGroupBy('f.metadata');
+		}
 
 		$or = [
 			$qb->expr()->eq('f.user_id', $qb->createNamedParameter($userId)),

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -55,6 +55,14 @@
       <code>callable(QueryBuilder): void</code>
     </UndefinedDocblockClass>
   </file>
+  <file src="lib/Db/SignRequestMapper.php">
+    <UndefinedClass occurrences="1">
+      <code>PostgreSQLPlatform</code>
+    </UndefinedClass>
+    <UndefinedDocblockClass occurrences="1">
+      <code>$qb-&gt;getConnection()-&gt;getDatabasePlatform()</code>
+    </UndefinedDocblockClass>
+  </file>
   <file src="lib/Files/TemplateLoader.php">
     <UndefinedClass occurrences="2">
       <code>LoadSidebar</code>