adding groupBy for PosteSQL

Signed-off-by: dartcafe <[email protected]>
nextcloud · May 27, 2024 · 8cf458d · 8cf458d
1 parent dd20c6b
commit 8cf458d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 36 deletions.
diff --git a/lib/Db/CommentMapper.php b/lib/Db/CommentMapper.php
@@ -110,16 +110,9 @@ protected function buildQuery(): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-			->from($this->getTableName(), self::TABLE);
-		$anonAlias = $this->joinAnon($qb, self::TABLE);
-
-		$qb->groupBy(
-			self::TABLE . '.id',
-			$anonAlias . '.anonymous',
-			$anonAlias . '.owner',
-			$anonAlias . '.show_results',
-			$anonAlias . '.expire',
-		);
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id');
+		$this->joinAnon($qb, self::TABLE);
 
 		return $qb;
 	}

diff --git a/lib/Db/OptionMapper.php b/lib/Db/OptionMapper.php
@@ -176,21 +176,14 @@ protected function buildQuery(bool $hideVotes = false): IQueryBuilder {
 
 		$qb->select(self::TABLE . '.*')
 			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id')
 			->orderBy('order', 'ASC');
 
 		$this->joinVotesCount($qb, self::TABLE, $hideVotes);
 		$this->joinPollForLimits($qb, self::TABLE);
 		$this->joinCurrentUserVote($qb, self::TABLE, $currentUserId);
 		$this->joinCurrentUserVoteCount($qb, self::TABLE, $currentUserId);
-		$anonAlias = $this->joinAnon($qb, self::TABLE);
-
-		$qb->groupBy(
-			self::TABLE . '.id',
-			$anonAlias . '.anonymous',
-			$anonAlias . '.owner',
-			$anonAlias . '.show_results',
-			$anonAlias . '.expire',
-		);
+		$this->joinAnon($qb, self::TABLE);
 
 		return $qb;
 	}

diff --git a/lib/Db/PollMapper.php b/lib/Db/PollMapper.php
@@ -196,7 +196,11 @@ protected function buildQuery(): IQueryBuilder {
 	 */
 	protected function joinUserRole(IQueryBuilder &$qb, string $fromAlias, string $currentUserId): void {
 		$joinAlias = 'shares';
-		$qb->addSelect($qb->createFunction('coalesce(' . $joinAlias . '.type, "") AS user_role'));
+		$qb->addSelect($qb->createFunction('coalesce(' . $joinAlias . '.type, "") AS user_role'))
+			->addGroupBy($joinAlias . '.type');
+
+		$qb->selectAlias($joinAlias . '.locked', 'is_current_user_locked')
+			->addGroupBy($joinAlias . '.locked');
 
 		$qb->leftJoin(
 			$fromAlias,

diff --git a/lib/Db/QBMapperWithUser.php b/lib/Db/QBMapperWithUser.php
@@ -57,7 +57,12 @@ protected function joinAnon(IQueryBuilder &$qb, string $fromAlias): string {
 			->selectAlias($joinAlias . '.owner', 'poll_owner_id')
 			->selectAlias($joinAlias . '.show_results', 'poll_show_results')
 			->selectAlias($joinAlias . '.expire', 'poll_expire')
-		;
+			->addGroupBy(
+				$joinAlias . '.anonymous',
+				$joinAlias . '.owner',
+				$joinAlias . '.show_results',
+				$joinAlias . '.expire',
+			);
 
 		$qb->leftJoin(
 			$fromAlias,

diff --git a/lib/Db/ShareMapper.php b/lib/Db/ShareMapper.php
@@ -60,7 +60,7 @@ public function findByPoll(int $pollId, bool $getDeleted = false): array {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-		->from($this->getTableName(), self::TABLE)
+			->from($this->getTableName(), self::TABLE)
 			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)));
 
@@ -83,6 +83,7 @@ public function findByPollNotInvited(int $pollId, bool $getDeleted = false): arr
 
 		$qb->select('*')
 			->from($this->getTableName())
+			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq('poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('invitation_sent', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
 
@@ -103,6 +104,7 @@ public function findByPollUnreminded(int $pollId, bool $getDeleted = false): arr
 
 		$qb->select('*')
 			->from($this->getTableName())
+			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq('poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('reminder_sent', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
 
@@ -120,7 +122,8 @@ public function findByPollAndUser(int $pollId, string $userId, bool $findDeleted
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-		->from($this->getTableName(), self::TABLE)
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq(self::TABLE . '.user_id', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
 			->andWhere($qb->expr()->isNotNull(self::TABLE . '.id'));
@@ -160,7 +163,8 @@ public function findByToken(string $token, bool $getDeleted = false): Share {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-		->from($this->getTableName(), self::TABLE)
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id')
 			->where($qb->expr()->eq(self::TABLE . '.token', $qb->createNamedParameter($token, IQueryBuilder::PARAM_STR)));
 
 		if (!$getDeleted) {

diff --git a/lib/Db/VoteMapper.php b/lib/Db/VoteMapper.php
@@ -118,6 +118,7 @@ public function findParticipantsByPoll(int $pollId): array {
 
 		$qb->selectDistinct([self::TABLE . '.user_id', self::TABLE . '.poll_id'])
 			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.user_id', self::TABLE . '.poll_id')
 			->where(
 				$qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT))
 			);
@@ -187,7 +188,8 @@ protected function buildQuery(bool $findOrphaned = false): IQueryBuilder {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select(self::TABLE . '.*')
-			->from($this->getTableName(), self::TABLE);
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id');
 
 		$optionAlias = $this->joinOption($qb, self::TABLE);
 
@@ -197,17 +199,9 @@ protected function buildQuery(bool $findOrphaned = false): IQueryBuilder {
 		} else {
 			$qb->where($qb->expr()->isNotNull($optionAlias . '.id'));
 		}
-		$anonAlias = $this->joinAnon($qb, self::TABLE);
-
-		$qb->groupBy(
-			self::TABLE . '.id',
-			$optionAlias . '.id',
-			$anonAlias . '.anonymous',
-			$anonAlias . '.owner',
-			$anonAlias . '.show_results',
-			$anonAlias . '.expire',
-		);
 
+		$this->joinAnon($qb, self::TABLE);
+
 		return $qb;
 	}
 
@@ -218,7 +212,8 @@ protected function buildQuery(bool $findOrphaned = false): IQueryBuilder {
 	protected function joinOption(IQueryBuilder &$qb, string $fromAlias): string {
 		$joinAlias = 'options';
 
-		$qb->selectAlias($joinAlias . '.id', 'option_id');
+		$qb->selectAlias($joinAlias . '.id', 'option_id')
+			->addGroupBy($joinAlias . '.id');
 
 		$qb->leftJoin(
 			$fromAlias,