Merge pull request #639 from mruegenberg/master

Add Typeable instance for User entity in Auth.HashDB. Fix #634.
This commit is contained in:
Michael Snoyman 2013-12-22 20:42:06 -08:00
commit 742e21f011

View File

@ -1,3 +1,4 @@
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleContexts #-}
@ -82,6 +83,7 @@ import Text.Hamlet (hamlet)
import Control.Applicative ((<$>), (<*>)) import Control.Applicative ((<$>), (<*>))
import Control.Monad (replicateM,liftM) import Control.Monad (replicateM,liftM)
import Data.Typeable
import qualified Data.ByteString.Lazy.Char8 as BS (pack) import qualified Data.ByteString.Lazy.Char8 as BS (pack)
import Data.Digest.Pure.SHA (sha1, showDigest) import Data.Digest.Pure.SHA (sha1, showDigest)
@ -258,6 +260,7 @@ User
password Text password Text
salt Text salt Text
UniqueUser username UniqueUser username
deriving Typeable
|] |]
instance HashDBUser (UserGeneric backend) where instance HashDBUser (UserGeneric backend) where