From 254795cb40ee42310292570a8fe633bab94bba9e Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 15 Apr 2011 12:36:19 +0300
Subject: [PATCH] Various scaffolding tweaks

---
 scaffold.hs                 | 2 +-
 scaffold/Model_hs.cg        | 1 -
 scaffold/mini-sitearg_hs.cg | 3 +--
 scaffold/sitearg_hs.cg      | 9 +--------
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/scaffold.hs b/scaffold.hs
index b411231c..c89098dd 100644
--- a/scaffold.hs
+++ b/scaffold.hs
@@ -13,7 +13,7 @@ import qualified Data.Text.Lazy.Encoding as LT
 import Control.Monad (when, unless)
 
 qq :: String
-#if GHC7
+#if __GLASGOW_HASKELL__ >= 700
 qq = ""
 #else
 qq = "$"
diff --git a/scaffold/Model_hs.cg b/scaffold/Model_hs.cg
index 79fad3e9..eec15f98 100644
--- a/scaffold/Model_hs.cg
+++ b/scaffold/Model_hs.cg
@@ -2,7 +2,6 @@
 module Model where
 
 import Yesod
-import Database.Persist.TH (share, mkMigrate)
 import Data.Text (Text)
 
 -- You can define all of your database entities in the entities file.
diff --git a/scaffold/mini-sitearg_hs.cg b/scaffold/mini-sitearg_hs.cg
index b2e68221..d71aec4d 100644
--- a/scaffold/mini-sitearg_hs.cg
+++ b/scaffold/mini-sitearg_hs.cg
@@ -24,7 +24,6 @@ import Control.Monad (unless)
 import Control.Monad.Trans.Class (lift)
 import Control.Monad.IO.Class (liftIO)
 import qualified Data.Text as T
-import Blaze.ByteString.Builder.Char.Utf8 (fromText)
 
 -- | The site argument for your application. This can be a good place to
 -- keep settings and values requiring initialization before your application
@@ -78,7 +77,7 @@ instance Yesod ~sitearg~ where
     -- This is done to provide an optimization for serving static files from
     -- a separate domain. Please see the staticroot setting in Settings.hs
     urlRenderOverride a (StaticR s) =
-        Just $ uncurry (joinPath a $ fromText Settings.staticroot) $ renderRoute s
+        Just $ uncurry (joinPath a Settings.staticroot) $ renderRoute s
     urlRenderOverride _ _ = Nothing
 
     -- This function creates static content files in the static folder
diff --git a/scaffold/sitearg_hs.cg b/scaffold/sitearg_hs.cg
index 3ce995ee..d632a659 100644
--- a/scaffold/sitearg_hs.cg
+++ b/scaffold/sitearg_hs.cg
@@ -34,7 +34,6 @@ import qualified Data.Text.Lazy
 import qualified Data.Text.Lazy.Encoding
 import Text.Jasmine (minifym)
 import qualified Data.Text as T
-import Blaze.ByteString.Builder.Char.Utf8 (fromText)
 
 -- | The site argument for your application. This can be a good place to
 -- keep settings and values requiring initialization before your application
@@ -89,7 +88,7 @@ instance Yesod ~sitearg~ where
     -- This is done to provide an optimization for serving static files from
     -- a separate domain. Please see the staticroot setting in Settings.hs
     urlRenderOverride a (StaticR s) =
-        Just $ uncurry (joinPath a $ fromText Settings.staticroot) $ renderRoute s
+        Just $ uncurry (joinPath a Settings.staticroot) $ renderRoute s
     urlRenderOverride _ _ = Nothing
 
     -- The page to be redirected to when authentication is required.
@@ -135,9 +134,6 @@ instance YesodAuth ~sitearg~ where
             Nothing -> do
                 fmap Just $ insert $ User (credsIdent creds) Nothing
 
-    showAuthId _ = showKey (undefined :: YesodDB ~sitearg~ IO a) . fromPersistKey
-    readAuthId _ = fmap toPersistKey . readKey (undefined :: YesodDB ~sitearg~ IO a)
-
     authPlugins = [ authOpenId
                   , authEmail
                   ]
@@ -145,9 +141,6 @@ instance YesodAuth ~sitearg~ where
 instance YesodAuthEmail ~sitearg~ where
     type AuthEmailId ~sitearg~ = EmailId
 
-    showAuthEmailId _ = showKey (undefined :: YesodDB ~sitearg~ IO a) . fromPersistKey
-    readAuthEmailId _ = fmap toPersistKey . readKey (undefined :: YesodDB ~sitearg~ IO a)
-
     addUnverified email verkey =
         runDB $ insert $ Email email Nothing $ Just verkey
     sendVerifyEmail email _ verurl = liftIO $ renderSendMail Mail