RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some SQL weirdness

pull/37/head
Varun Patil 2022-08-18 03:23:41 +00:00
parent cf256d2db7
commit 62fb0621a3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Db/Util.php
View File

@ -133,9 +133,9 @@ class Util {
$sql = 'SELECT day_id, COUNT(file_id) AS count $sql = 'SELECT day_id, COUNT(file_id) AS count
FROM `*PREFIX*polaroid` FROM `*PREFIX*polaroid`
INNER JOIN `*PREFIX*filecache` INNER JOIN `*PREFIX*filecache`
ON user_id=? ON `*PREFIX*filecache`.`fileid` = `*PREFIX*polaroid`.`file_id`
AND `*PREFIX*polaroid`.`file_id` = `*PREFIX*filecache`.`fileid`
AND `*PREFIX*filecache`.`path` LIKE "files/Photos/%" AND `*PREFIX*filecache`.`path` LIKE "files/Photos/%"
WHERE user_id=?
GROUP BY day_id GROUP BY day_id
ORDER BY day_id DESC'; ORDER BY day_id DESC';
$rows = $this->connection->executeQuery($sql, [$user], [ $rows = $this->connection->executeQuery($sql, [$user], [
@ -148,7 +148,7 @@ class Util {
$sql = 'SELECT day_id, COUNT(file_id) AS count $sql = 'SELECT day_id, COUNT(file_id) AS count
FROM `*PREFIX*polaroid` FROM `*PREFIX*polaroid`
INNER JOIN `*PREFIX*filecache` INNER JOIN `*PREFIX*filecache`
ON `*PREFIX*polaroid`.`file_id` = `*PREFIX*filecache`.`fileid` ON `*PREFIX*filecache`.`fileid` = `*PREFIX*polaroid`.`file_id`
AND (`*PREFIX*filecache`.`parent`=? OR `*PREFIX*filecache`.`fileid`=?) AND (`*PREFIX*filecache`.`parent`=? OR `*PREFIX*filecache`.`fileid`=?)
GROUP BY day_id GROUP BY day_id
ORDER BY day_id DESC'; ORDER BY day_id DESC';
@ -175,7 +175,7 @@ class Util {
): array { ): array {
$sql = 'SELECT file_id, *PREFIX*filecache.etag, is_video $sql = 'SELECT file_id, *PREFIX*filecache.etag, is_video
FROM *PREFIX*polaroid FROM *PREFIX*polaroid
LEFT JOIN *PREFIX*filecache INNER JOIN *PREFIX*filecache
ON *PREFIX*filecache.fileid = *PREFIX*polaroid.file_id ON *PREFIX*filecache.fileid = *PREFIX*polaroid.file_id
AND `*PREFIX*filecache`.`path` LIKE "files/Photos/%" AND `*PREFIX*filecache`.`path` LIKE "files/Photos/%"
WHERE user_id = ? AND day_id = ? WHERE user_id = ? AND day_id = ?
@ -193,10 +193,10 @@ class Util {
$sql = 'SELECT file_id, *PREFIX*filecache.etag, is_video $sql = 'SELECT file_id, *PREFIX*filecache.etag, is_video
FROM `*PREFIX*polaroid` FROM `*PREFIX*polaroid`
INNER JOIN `*PREFIX*filecache` INNER JOIN `*PREFIX*filecache`
ON `*PREFIX*polaroid`.`day_id`=? ON `*PREFIX*filecache`.`fileid` = `*PREFIX*polaroid`.`file_id`
AND `*PREFIX*polaroid`.`file_id` = `*PREFIX*filecache`.`fileid` AND (`*PREFIX*filecache`.`parent`=? OR `*PREFIX*filecache`.`fileid`=?)
AND (`*PREFIX*filecache`.`parent`=? OR `*PREFIX*filecache`.`fileid`=?);'; WHERE `*PREFIX*polaroid`.`day_id`=?';
$rows = $this->connection->executeQuery($sql, [$dayId, $folderId, $folderId], [ $rows = $this->connection->executeQuery($sql, [$folderId, $folderId, $dayId], [
\PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT,
])->fetchAll(); ])->fetchAll();
return $this->processDay($rows); return $this->processDay($rows);