diff options
| author |  Adrien Dorsaz <adrien@adorsaz.ch>
| 2017-08-15 10:44:54 +0200 |
|---|---|---|
| committer | Adrien Dorsaz <adrien@adorsaz.ch>
| 2017-08-15 10:45:26 +0200 |
| commit | 3b8b9eabd037130b4c05d6b615bd9ad8f02cc59f (patch) | |
| tree | a7caba31ee92d56e673276fb997690f8774f584f /app/Models/EntryDAOPGSQL.php | |
| parent | da685f9390b8bfa1193c9d335d36f3648c17fe7e (diff) | |
commitNewEntries should ignore conflicting keys on migration from entrytmp to entry
Fixes #1610 by first ignoring all entries from entrytmp which exists
already inside the entry table.
Diffstat (limited to 'app/Models/EntryDAOPGSQL.php')
| -rw-r--r-- | app/Models/EntryDAOPGSQL.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/Models/EntryDAOPGSQL.php b/app/Models/EntryDAOPGSQL.php index b25993c47..f70c5f65c 100644 --- a/app/Models/EntryDAOPGSQL.php +++ b/app/Models/EntryDAOPGSQL.php @@ -30,7 +30,10 @@ maxrank bigint := (SELECT MAX(id) FROM `' . $this->prefix . 'entrytmp`); rank bigint := (SELECT maxrank - COUNT(*) FROM `' . $this->prefix . 'entrytmp`); BEGIN INSERT INTO `' . $this->prefix . 'entry` (id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags) - (SELECT rank + row_number() OVER(ORDER BY date) AS id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags FROM `' . $this->prefix . 'entrytmp` ORDER BY date); + (SELECT rank + row_number() OVER(ORDER BY date) AS id, guid, title, author, content, link, date, `lastSeen`, hash, is_read, is_favorite, id_feed, tags + FROM `' . $this->prefix . 'entrytmp` AS entrytmp + WHERE NOT EXISTS (SELECT 1 FROM `' . $this->prefix . 'entry` AS entry WHERE entrytmp.id_feed = entry.id_feed AND entrytmp.guid = entry.guid) + ORDER BY date); DELETE FROM `' . $this->prefix . 'entrytmp` WHERE id <= maxrank; END $$;'; $hadTransaction = $this->bd->inTransaction(); |