From 30352f56ecda78fbe01bf4525e0ccbc5774a7622 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 27 Aug 2014 10:53:17 +0300
Subject: [PATCH] Some fixes for persistent2

---
 yesod-auth/Yesod/Auth.hs                   | 4 ++++
 yesod-persistent/test/Yesod/PersistSpec.hs | 1 +
 2 files changed, 5 insertions(+)

diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs
index 8ba7a9ee..ddfd0ed1 100644
--- a/yesod-auth/Yesod/Auth.hs
+++ b/yesod-auth/Yesod/Auth.hs
@@ -477,6 +477,10 @@ type YesodAuthPersist master =
 --
 -- Since 1.2.0
 type AuthEntity master = KeyEntity (AuthId master)
+#if MIN_VERSION_persistent(2, 0, 0)
+type family KeyEntity key
+type instance KeyEntity (Key x) = x
+#endif
 
 -- | Similar to 'maybeAuthId', but redirects to a login page if user is not
 -- authenticated or responds with error 401 if this is an API client (expecting JSON).
diff --git a/yesod-persistent/test/Yesod/PersistSpec.hs b/yesod-persistent/test/Yesod/PersistSpec.hs
index 474dc9e3..58cdb2c4 100644
--- a/yesod-persistent/test/Yesod/PersistSpec.hs
+++ b/yesod-persistent/test/Yesod/PersistSpec.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings, TemplateHaskell, QuasiQuotes, TypeFamilies #-}
 {-# LANGUAGE EmptyDataDecls, FlexibleContexts, GADTs #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 module Yesod.PersistSpec where
 
 import Test.Hspec