From af2ea0952ab7b0dd6b022b36dd73f72612204583 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 23 Dec 2014 11:30:55 +0200 Subject: [PATCH] Use a nullable column to speed up migration --- Application.hs | 6 +++++- Handler/StackageHome.hs | 2 +- Handler/UploadStackage.hs | 2 +- config/models | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Application.hs b/Application.hs index 56a7406..ac30d9a 100644 --- a/Application.hs +++ b/Application.hs @@ -403,7 +403,11 @@ fixSnapSlugs = setCorePackages :: MonadIO m => ReaderT SqlBackend m () setCorePackages = - updateWhere [PackageName' <-. defaultCorePackages] [PackageCore =. True] + updateWhere + [ PackageName' <-. defaultCorePackages + , PackageCore ==. Nothing + ] + [PackageCore =. Just True] where defaultCorePackages = map PackageName $ words =<< [ "ghc hoopl bytestring unix haskeline Cabal base time xhtml" diff --git a/Handler/StackageHome.hs b/Handler/StackageHome.hs index db03a7b..c59c932 100644 --- a/Handler/StackageHome.hs +++ b/Handler/StackageHome.hs @@ -146,7 +146,7 @@ getStackageCabalConfigR slug = do toBuilder '\n' constraint p - | packageCore p = toBuilder $ asText " installed" + | Just True <- packageCore p = toBuilder $ asText " installed" | otherwise = toBuilder (asText " ==") ++ toBuilder (toPathPiece $ packageVersion p) diff --git a/Handler/UploadStackage.hs b/Handler/UploadStackage.hs index 5784a97..1c7c19a 100644 --- a/Handler/UploadStackage.hs +++ b/Handler/UploadStackage.hs @@ -156,7 +156,7 @@ putUploadStackageR = do , packageVersion = version , packageOverwrite = overwrite , packageHasHaddocks = False - , packageCore = name `member` cores + , packageCore = Just $ name `member` cores } setAlias diff --git a/config/models b/config/models index bf633f2..8b555c8 100644 --- a/config/models +++ b/config/models @@ -44,7 +44,7 @@ Package version Version hasHaddocks Bool default=true overwrite Bool - core Bool default=false + core Bool Maybe -- use Maybe to speed up migration Tag package PackageName