From 66a161e4f78467fb87863f29c05be3545897e65e Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Sun, 26 Jun 2022 09:41:30 +0200 Subject: fix type always string for findAllFromUser Signed-off-by: Benjamin Brahmer --- AUTHORS.md | 9 +++++++-- CHANGELOG.md | 1 + lib/Db/ItemMapperV2.php | 13 ++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 7ac9408e1..c2e1232af 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -1,7 +1,7 @@ # Authors * [Bernhard Posselt](mailto:dev@bernhard-posselt.com) -* [Alessandro Cosentino](mailto:cosenal@gmail.com) * [Benjamin Brahmer](mailto:info@b-brahmer.de) +* [Alessandro Cosentino](mailto:cosenal@gmail.com) * [Marco Nassabain](mailto:marco.nassabain@hotmail.com) * [Robin Appelman](mailto:icewind@owncloud.com) * [Sean Molenaar](mailto:sean@seanmolenaar.eu) @@ -9,10 +9,10 @@ * [Sean Molenaar](mailto:SMillerDev@users.noreply.github.com) * [anoy](mailto:anoymouserver+github@mailbox.org) * [Morris Jobke](mailto:hey@morrisjobke.de) +* [Paul Tirk](mailto:paultirk@paultirk.com) * [Jimmy Huynh](mailto:jimmy.huynh@etu.unistra.fr) * [Aurélien](mailto:dav.aurelien@gmail.com) * [Jan-Christoph Borchardt](mailto:hey@jancborchardt.net) -* [Paul Tirk](mailto:paultirk@paultirk.com) * [Daniel Schaal](mailto:daniel@schaal.email) * [Davide Saurino](mailto:davide.saurino@alcacoop.it) * [raghunayyar](mailto:me@iraghu.com) @@ -71,11 +71,14 @@ * [Valdnet](mailto:47037905+Valdnet@users.noreply.github.com) * [bbBowser](mailto:carspi@mail.de) * [benediktb](mailto:benedikt@blablub.de) +* [chylex](mailto:contact@chylex.com) * [coderkun](mailto:olli@coderkun.de) * [davidak](mailto:git@davidak.de) * [hooger](mailto:horvathg.1988@gmail.com) * [lsmooth](mailto:ls@lsmooth.de) * [s17t.net](mailto:mail+github@s17t.net) +* [Accalia](mailto:Accalia@Elementia.me) +* [Accalia Elementia](mailto:accalia@elementia.me) * [Alec Kojaev](mailto:alec@kojaev.name) * [Alessandro](mailto:cosenal@gmail.com) * [Alexander Grüßung](mailto:alexander@gruessung-online.de) @@ -89,6 +92,7 @@ * [Aurelien DAVID](mailto:dav.aurelien@gmail.com) * [Benedikt Geißler](mailto:benedikt@g5r.eu) * [Bernhard Posselt](mailto:bernhard@desktop.localdomain) +* [Björn Bidar](mailto:bjorn.bidar@thaodan.de) * [Candid Dauth](mailto:cdauth@cdauth.eu) * [Carlos Silva](mailto:r3pek@r3pek.org) * [Cesar Enrique Garcia Dabo](mailto:enrique@engarda.org) @@ -175,6 +179,7 @@ * [markusj](mailto:markusj@users.noreply.github.com) * [mnassabain](mailto:34754819+mnassabain@users.noreply.github.com) * [mormegil](mailto:mormegil@centrum.cz) +* [nextcloud486153](mailto:78801830+nextcloud486153@users.noreply.github.com) * [nexus-uw](mailto:you@example.com) * [repat](mailto:repat@repat.de) * [ritchiewilson](mailto:rawilson52@gmail.com) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d8121ab9..a18c58725 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1 ### Changed ### Fixed +- Fix export of unread and starred articles failing due to postgres error (#1839, #1249) # Releases ## [18.1.0] - 2022-06-10 diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index 8a92354d8..1e206f846 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -62,7 +62,18 @@ class ItemMapperV2 extends NewsMapperV2 ->setParameter('user_id', $userId, IQueryBuilder::PARAM_STR); foreach ($params as $key => $value) { - $builder->andWhere("$key = " . $builder->createNamedParameter($value)); + switch (gettype($value)) { + case 'boolean': + $type = IQueryBuilder::PARAM_BOOL; + break; + case 'integer': + $type = IQueryBuilder::PARAM_INT; + break; + default: + $type = IQueryBuilder::PARAM_STR; + break; + } + $builder->andWhere("$key = " . $builder->createNamedParameter($value, $type)); } return $this->findEntities($builder); -- cgit v1.2.3