From 419a1978b6d8052f88783a4624cd17602422030a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 17 Nov 2025 13:46:28 +0100 Subject: Fix MySQL commitNewEntries (#8223) I just realised that `commitNewEntries()` was not sorting articles properly before insertion in database when using MySQL: Articles were not sorted by publication date as expected from the temporary table before insertion in the final table. MySQL was not picking the correct field, so fixed with an explicit alias. Discovered because I did some tests with MySQL in https://github.com/FreshRSS/FreshRSS/pull/6957 At the same time, I did the same change for PostgreSQL and SQLite although those were not affected. --- app/Models/EntryDAOSQLite.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'app/Models/EntryDAOSQLite.php') diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php index c272272b0..4ae4d3579 100644 --- a/app/Models/EntryDAOSQLite.php +++ b/app/Models/EntryDAOSQLite.php @@ -81,20 +81,20 @@ class FreshRSS_EntryDAOSQLite extends FreshRSS_EntryDAO { #[\Override] public function commitNewEntries(): bool { $sql = <<<'SQL' -DROP TABLE IF EXISTS `tmp`; -CREATE TEMP TABLE `tmp` AS - SELECT id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes - FROM `_entrytmp` - ORDER BY date, id; -INSERT OR IGNORE INTO `_entry` - (id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes) - SELECT rowid + (SELECT MAX(id) - COUNT(*) FROM `tmp`) AS id, - guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes - FROM `tmp` - ORDER BY date, id; -DELETE FROM `_entrytmp` WHERE id <= (SELECT MAX(id) FROM `tmp`); -DROP TABLE IF EXISTS `tmp`; -SQL; + DROP TABLE IF EXISTS `tmp`; + CREATE TEMP TABLE `tmp` AS + SELECT id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes + FROM `_entrytmp` + ORDER BY date, id; + INSERT OR IGNORE INTO `_entry` + (id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes) + SELECT rowid + (SELECT MAX(id) - COUNT(*) FROM `tmp`) AS id, + guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags, attributes + FROM `tmp` t + ORDER BY t.date, t.id; + DELETE FROM `_entrytmp` WHERE id <= (SELECT MAX(id) FROM `tmp`); + DROP TABLE IF EXISTS `tmp`; + SQL; $hadTransaction = $this->pdo->inTransaction(); if (!$hadTransaction) { $this->pdo->beginTransaction(); -- cgit v1.2.3