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

refactor: move CTE to trait 

Signed-off-by: Varun Patil <varunpatil@ucla.edu>
pull/579/head
Varun Patil 2023-04-13 22:49:12 -07:00
parent a9b0f463a1
commit 04728a1d60
2 changed files with 83 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
lib/Db/TimelineQueryCTE.php 100644
View File

@ -0,0 +1,79 @@
<?php
declare(strict_types=1);
namespace OCA\Memories\Db;
trait TimelineQueryCTE
{
protected static function CTE_FOLDERS_ALL(bool $notArchive): string
{
$extraJoinOn = $notArchive ? "AND f.name <> '.archive'" : '';
return
"*PREFIX*cte_folders_all(fileid, name) AS (
SELECT
f.fileid,
f.name
FROM
*PREFIX*filecache f
WHERE
f.fileid IN (:topFolderIds)
UNION ALL
SELECT
f.fileid,
f.name
FROM
*PREFIX*filecache f
INNER JOIN *PREFIX*cte_folders_all c
ON (f.parent = c.fileid
AND f.mimetype = (SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = 'httpd/unix-directory')
{$extraJoinOn}
)
)";
}
/** CTE to get all folders recursively in the given top folders excluding archive */
protected static function CTE_FOLDERS(): string
{
$cte = '*PREFIX*cte_folders AS (
SELECT
fileid
FROM
*PREFIX*cte_folders_all
GROUP BY
fileid
)';
return self::bundleCTEs([self::CTE_FOLDERS_ALL(true), $cte]);
}
/** CTE to get all archive folders recursively in the given top folders */
protected static function CTE_FOLDERS_ARCHIVE(): string
{
$cte = '*PREFIX*cte_folders(fileid) AS (
SELECT
cfa.fileid
FROM
*PREFIX*cte_folders_all cfa
WHERE
cfa.name = \'.archive\'
GROUP BY
cfa.fileid
UNION ALL
SELECT
f.fileid
FROM
*PREFIX*filecache f
INNER JOIN *PREFIX*cte_folders c
ON (f.parent = c.fileid)
)';
return self::bundleCTEs([self::CTE_FOLDERS_ALL(false), $cte]);
}
protected static function bundleCTEs(array $ctes): string
{
return 'WITH RECURSIVE ' . implode(',', $ctes);
}
}

70
lib/Db/TimelineQueryDays.php
View File

@ -8,72 +8,10 @@ use OCA\Memories\ClustersBackend;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
const CTE_FOLDERS = // CTE to get all folders recursively in the given top folders excluding archive
'WITH RECURSIVE *PREFIX*cte_folders_all(fileid) AS (
SELECT
f.fileid
FROM
*PREFIX*filecache f
WHERE
f.fileid IN (:topFolderIds)
UNION ALL
SELECT
f.fileid
FROM
*PREFIX*filecache f
INNER JOIN *PREFIX*cte_folders_all c
ON (f.parent = c.fileid
AND f.mimetype = (SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = \'httpd/unix-directory\')
AND f.name <> \'.archive\'
)
), *PREFIX*cte_folders AS (
SELECT
fileid
FROM
*PREFIX*cte_folders_all
GROUP BY
fileid
)';
const CTE_FOLDERS_ARCHIVE = // CTE to get all archive folders recursively in the given top folders
'WITH RECURSIVE *PREFIX*cte_folders_all(fileid, name) AS (
SELECT
f.fileid,
f.name
FROM
*PREFIX*filecache f
WHERE
f.fileid IN (:topFolderIds)
UNION ALL
SELECT
f.fileid,
f.name
FROM
*PREFIX*filecache f
INNER JOIN *PREFIX*cte_folders_all c
ON (f.parent = c.fileid
AND f.mimetype = (SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = \'httpd/unix-directory\')
)
), *PREFIX*cte_folders(fileid) AS (
SELECT
cfa.fileid
FROM
*PREFIX*cte_folders_all cfa
WHERE
cfa.name = \'.archive\'
GROUP BY
cfa.fileid
UNION ALL
SELECT
f.fileid
FROM
*PREFIX*filecache f
INNER JOIN *PREFIX*cte_folders c
ON (f.parent = c.fileid)
)';
trait TimelineQueryDays
{
use TimelineQueryCTE;
protected IDBConnection $connection;
/**
@ -187,8 +125,8 @@ trait TimelineQueryDays
// Get SQL
$CTE_SQL = \array_key_exists('cteFoldersArchive', $params) && $params['cteFoldersArchive']
? CTE_FOLDERS_ARCHIVE
: CTE_FOLDERS;
? self::CTE_FOLDERS_ARCHIVE()
: self::CTE_FOLDERS();
// Add WITH clause if needed
if (false !== strpos($sql, 'cte_folders')) {