diff options
| author | Robin Appelman <robin@icewind.nl> | 2020-11-09 17:43:29 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2020-11-19 21:41:13 +0000 |
| commit | 22bf656e0232c577ffa581700d73e23768d51fc7 (patch) | |
| tree | fb0c6ebc56c6e5673087c5318028d53747c2f908 /lib/private | |
| parent | 8021bacbdc82c0a63e7398a67a9f6d081d05bb59 (diff) | |
| download | nextcloud-server-22bf656e0232c577ffa581700d73e23768d51fc7.tar.gz nextcloud-server-22bf656e0232c577ffa581700d73e23768d51fc7.zip | |
allow selecting multiple columns with SELECT DISTINCT
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/DB/QueryBuilder/QueryBuilder.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index 0b4f9831292..53025f8a5b4 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -435,8 +435,14 @@ class QueryBuilder implements IQueryBuilder { * @return $this This QueryBuilder instance. */ public function selectDistinct($select) { + if (!is_array($select)) { + $select = [$select]; + } + + $quotedSelect = $this->helper->quoteColumnNames($select); + $this->queryBuilder->addSelect( - 'DISTINCT ' . $this->helper->quoteColumnName($select) + 'DISTINCT ' . implode(', ', $quotedSelect) ); return $this; |