From 850c8d4dae47489e0dbf0eb46276eaf0002bf123 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 13 Oct 2020 14:14:58 +0200 Subject: [PATCH] fix(changelog): try not to crash on unknown changelog items --- src/Handler/Info.hs | 2 +- src/Model/Migration.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs index c45c5c9d6..99a748da2 100644 --- a/src/Handler/Info.hs +++ b/src/Handler/Info.hs @@ -37,7 +37,7 @@ getLegalR = -- | Allgemeine Informationen getInfoR :: Handler Html getInfoR = do - changelogEntries' <- runDB $ selectList [] [] + changelogEntries' <- runDB $ selectList [ ChangelogItemFirstSeenItem <-. universeF ] [] let changelogEntries = Map.fromListWith Set.union [ (Down changelogItemFirstSeenFirstSeen, Set.singleton changelogItemFirstSeenItem) | Entity _ ChangelogItemFirstSeen{..} <- changelogEntries' diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs index 27657bbe5..a1fe221e1 100644 --- a/src/Model/Migration.hs +++ b/src/Model/Migration.hs @@ -173,7 +173,7 @@ migrateManual = do , ("file_content_entry_chunk_hash", "CREATE INDEX file_content_entry_chunk_hash ON \"file_content_entry\" (chunk_hash)" ) ] - recordedChangelogItems <- lift . lift $ selectList [] [] + recordedChangelogItems <- lift . lift $ selectList [ ChangelogItemFirstSeenItem <-. universeF ] [] let missingChangelogItems = Set.toList $ Set.fromList universeF `Set.difference` recordedChangelogItems' where recordedChangelogItems' = Set.fromList [ changelogItemFirstSeenItem | Entity _ ChangelogItemFirstSeen{..} <- recordedChangelogItems ] unless (null missingChangelogItems) $ do