Skip to content

Commit a1c2e5c

Browse files
committed
fix(updates): show chapters from all sources of merged entries
The merged branch of updatesView grouped children by merge_id, collapsing every merged source down to a single arbitrary child. Chapters from any other source of a merged entry never appeared in Updates. Drop the GROUP BY so all children are joined.
1 parent 3b06366 commit a1c2e5c

2 files changed

Lines changed: 63 additions & 1 deletion

File tree

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
-- Fix updatesView dropping chapters from all-but-one source of a merged entry.
2+
-- The merged branch grouped children by merge_id, collapsing every merged source
3+
-- down to a single arbitrary child, so newer chapters from other merged sources
4+
-- never appeared in the Updates tab. Recreate the view without the GROUP BY.
5+
DROP VIEW IF EXISTS updatesView;
6+
7+
CREATE VIEW updatesView AS
8+
SELECT
9+
mangas._id AS mangaId,
10+
mangas.title AS mangaTitle,
11+
chapters._id AS chapterId,
12+
chapters.name AS chapterName,
13+
chapters.scanlator,
14+
chapters.url AS chapterUrl,
15+
chapters.read,
16+
chapters.bookmark,
17+
chapters.last_page_read,
18+
mangas.source,
19+
mangas.favorite,
20+
mangas.thumbnail_url AS thumbnailUrl,
21+
mangas.cover_last_modified AS coverLastModified,
22+
chapters.date_upload AS dateUpload,
23+
chapters.date_fetch AS datefetch,
24+
excluded_scanlators.scanlator AS excludedScanlator
25+
FROM mangas JOIN chapters
26+
ON mangas._id = chapters.manga_id
27+
LEFT JOIN excluded_scanlators
28+
ON mangas._id = excluded_scanlators.manga_id
29+
AND chapters.scanlator = excluded_scanlators.scanlator
30+
WHERE favorite = 1 AND source <> 6969
31+
AND date_fetch > date_added
32+
UNION
33+
SELECT
34+
mangas._id AS mangaId,
35+
mangas.title AS mangaTitle,
36+
chapters._id AS chapterId,
37+
chapters.name AS chapterName,
38+
chapters.scanlator,
39+
chapters.url AS chapterUrl,
40+
chapters.read,
41+
chapters.bookmark,
42+
chapters.last_page_read,
43+
mangas.source,
44+
mangas.favorite,
45+
mangas.thumbnail_url AS thumbnailUrl,
46+
mangas.cover_last_modified AS coverLastModified,
47+
chapters.date_upload AS dateUpload,
48+
chapters.date_fetch AS datefetch,
49+
excluded_scanlators.scanlator AS excludedScanlator
50+
FROM mangas
51+
LEFT JOIN (
52+
SELECT merged.manga_id,merged.merge_id
53+
FROM merged
54+
) AS ME
55+
ON ME.merge_id = mangas._id
56+
JOIN chapters
57+
ON ME.manga_id = chapters.manga_id
58+
LEFT JOIN excluded_scanlators
59+
ON mangas._id = excluded_scanlators.manga_id
60+
AND chapters.scanlator = excluded_scanlators.scanlator
61+
WHERE favorite = 1 AND source = 6969
62+
AND date_fetch > date_added
63+
ORDER BY datefetch DESC;

data/src/main/sqldelight/tachiyomi/view/updatesView.sq

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ FROM mangas
4646
LEFT JOIN (
4747
SELECT merged.manga_id,merged.merge_id
4848
FROM merged
49-
GROUP BY merged.merge_id
5049
) AS ME
5150
ON ME.merge_id = mangas._id
5251
JOIN chapters

0 commit comments

Comments
 (0)