From 91c9b4a2f06d8734b211a4983ae5553a3dec8ec9 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 4 Aug 2011 07:02:58 +0300
Subject: [PATCH] Fix PostgreSQL scaffolding

---
 yesod/scaffold.hs                    | 4 ++++
 yesod/scaffold/config/Settings.hs.cg | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/yesod/scaffold.hs b/yesod/scaffold.hs
index 3774eb2c..dd13baaf 100644
--- a/yesod/scaffold.hs
+++ b/yesod/scaffold.hs
@@ -111,6 +111,10 @@ scaffold = do
           MongoDB    -> $(codegen $ "mongoDBConnPool")
           Tiny       -> ""
 
+        textImport = case backend of
+          Postgresql -> ", concat, append, snoc, pack"
+          _          -> ""
+
         packages = if backend == MongoDB then "          , mongoDB\n         , bson\n" else ""
 
     let fst3 (x, _, _) = x
diff --git a/yesod/scaffold/config/Settings.hs.cg b/yesod/scaffold/config/Settings.hs.cg
index 6da3f68b..17e3ce08 100644
--- a/yesod/scaffold/config/Settings.hs.cg
+++ b/yesod/scaffold/config/Settings.hs.cg
@@ -32,7 +32,7 @@ import Yesod (liftIO, MonadControlIO, addWidget, addCassius, addJulius, addLuciu
 import Data.Monoid (mempty, mappend)
 import System.Directory (doesFileExist)
 import Prelude hiding (concat)
-import Data.Text (Text)
+import Data.Text (Text~textImport~)
 import Data.Object
 import qualified Data.Object.Yaml as YAML
 import Control.Monad (join)