Skip to content

Work around breaking server change and QB expressions #6736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kesselb merged 1 commit into from
Jun 13, 2022
Merged

Work around breaking server change and QB expressions #6736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Work around breaking server change and QB expressions 
Expressions are now "query function" objects instead of strings.

Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst
ChristophWurst committed Jun 13, 2022
commit f31a30837b87db12a206b63b4f58e37516ce8cbf
5 changes: 3 additions & 2 deletions lib/Db/MailboxMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use OCP\AppFramework\Db\QBMapper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\DB\QueryBuilder\IQueryFunction;
use OCP\IDBConnection;
use function array_map;

Expand Down Expand Up @@ -216,9 +217,9 @@ public function lockForVanishedSync(Mailbox $mailbox): void {
* @param IQueryBuilder $query
* @param int|null $value
*
* @return string
* @return string|IQueryFunction
*/
private function eqOrNull(IQueryBuilder $query, string $column, ?int $value, int $type): string {
private function eqOrNull(IQueryBuilder $query, string $column, ?int $value, int $type) {
if ($value === null) {
return $query->expr()->isNull($column);
}
Expand Down