From a32c10b354f22aef325eedc43661d0df36dd1251 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 8 Oct 2021 04:24:59 +0000
Subject: [PATCH] Simplifid query
---
src/Model/Photo.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 4636038043..c30da19bd8 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -653,7 +653,7 @@ class Photo
// At this time we just store the data in the cache
$albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
FROM `photo`
- WHERE `uid` = ? AND `album` != ? AND `album` != ? $sql_extra
+ WHERE `uid` = ? AND NOT `album` IN (?, ?) $sql_extra
GROUP BY `album` ORDER BY `created` DESC",
$uid,
self::CONTACT_PHOTOS,
@@ -663,7 +663,7 @@ class Photo
// This query doesn't do the count and is much faster
$albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total`
FROM `photo` USE INDEX (`uid_album_scale_created`)
- WHERE `uid` = ? AND `album` != ? AND `album` != ? $sql_extra",
+ WHERE `uid` = ? AND NOT `album` IN (?, ?) $sql_extra",
$uid,
self::CONTACT_PHOTOS,
DI::l10n()->t(self::CONTACT_PHOTOS)
--
2.39.5