From f39c950448f0ce8c7abd64bb4a27f976e9a88205 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 Apr 2022 13:31:54 +0300 Subject: [PATCH] Revert "Try showing less snapshots #311" This reverts commit 4ef23fd0f504253b9bd6ee967645629bdcb4b450. --- src/Handler/Package.hs | 2 +- src/Stackage/Database/Query.hs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Handler/Package.hs b/src/Handler/Package.hs index e7b304a..fad3c8f 100644 --- a/src/Handler/Package.hs +++ b/src/Handler/Package.hs @@ -157,7 +157,7 @@ getPackageSnapshotsR :: PackageNameP -> Handler Html getPackageSnapshotsR pn = track "Handler.Package.getPackageSnapshotsR" $ do cacheSeconds $ 60 * 60 * 24 - snapshots <- getLtsSnapshotsForPackage pn (Just 100) + snapshots <- getSnapshotsForPackage pn Nothing defaultLayout (do setTitle ("Packages for " >> toHtml pn) $(combineStylesheets 'StaticR [css_font_awesome_min_css]) diff --git a/src/Stackage/Database/Query.hs b/src/Stackage/Database/Query.hs index 9b4662a..df7d7e8 100644 --- a/src/Stackage/Database/Query.hs +++ b/src/Stackage/Database/Query.hs @@ -638,17 +638,15 @@ stringToArray :: -> SqlExpr (Value [String]) stringToArray s1 s2 = unsafeSqlFunction "string_to_array" (s1, s2) -getLtsSnapshotsForPackage +getSnapshotsForPackage :: GetStackageDatabase env m => PackageNameP -> Maybe Int -> m [(CompilerP, SnapshotPackageInfo)] -getLtsSnapshotsForPackage pname mlimit = +getSnapshotsForPackage pname mlimit = fmap (first unValue) <$> run (snapshotPackageInfoQuery $ \_sp s pn _v spiQ -> do - where_ $ - pn ^. PackageNameName ==. val pname &&. - (s ^. snapshotName `ilike` val "lts%") + where_ (pn ^. PackageNameName ==. val pname) orderBy [desc (s ^. SnapshotCreated)] forM_ mlimit (limit . fromIntegral) pure (s ^. SnapshotCompiler, spiQ))