More pair -> Entity changes

yesod-auth/Yesod/Auth/HashDB.hs

@@ -90,7 +90,7 @@ import Data.Digest.Pure.SHA        (sha1, showDigest)
 import Data.Text                   (Text, pack, unpack, append)
 import Data.Maybe                  (fromMaybe)
 import System.Random               (randomRIO)
-
+import Database.Persist.Store      (Entity (..))
 
 -- | Interface for data type which holds user info. It's just a
 --   collection of getters and setters
@@ -153,7 +153,7 @@ validateUser userID passwd = do
                       return $ hash == saltedHash salt passwd
   -- Get user data
   user <- runDB $ getBy userID
-  return $ fromMaybe False $ validate . snd =<< user
+  return $ fromMaybe False $ validate . entityVal =<< user
 
 
 login :: AuthRoute
@@ -206,7 +206,7 @@ getAuthIdHashDB authR uniq creds = do
                    Just u  -> runDB (getBy u)
             case x of
                 -- user exists
-                Just (uid, _) -> return $ Just uid
+                Just (Entity uid _) -> return $ Just uid
                 Nothing       -> do
                     setMessage [QQ(shamlet)| User not found |]
                     redirect $ authR LoginR

yesod-form/Yesod/Form/Fields.hs

@@ -53,7 +53,7 @@ import Data.Time (Day, TimeOfDay(..))
 import qualified Text.Email.Validate as Email
 import Network.URI (parseURI)
 import Database.Persist (PersistField)
-import Database.Persist.Query (Entity (..))
+import Database.Persist.Store (Entity (..))
 import Text.HTML.SanitizeXSS (sanitizeBalance)
 import Control.Monad (when, unless)
 import Data.List (intersect, nub)

yesod-persistent/Yesod/Persist.hs

@@ -12,6 +12,7 @@ module Yesod.Persist
 
 import Database.Persist
 import Database.Persist.Query
+import Database.Persist.Store (Entity (..))
 import Database.Persist.TH
 import Control.Monad.Trans.Class (MonadTrans)
 
@@ -45,7 +46,7 @@ getBy404 :: ( PersistUnique b m
             , Monad (b m)
             , MonadTrans b
             )
-         => Unique val b -> b m (Key b val, val)
+         => Unique val b -> b m (Entity b val)
 getBy404 key = do
     mres <- getBy key
     case mres of