1 files changed, 25 insertions, 23 deletions
diff --git a/standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch b/standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch
index 7a66e1fd1..ecdf72da4 100644
--- a/standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch
+++ b/standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch
@@ -1,41 +1,43 @@
-From efd18199fa245e51e6137036062ded8b0b26f78c Mon Sep 17 00:00:00 2001
+From ec2543b2156dc968530ad98e33d26f741a479e31 Mon Sep 17 00:00:00 2001
 From: dummy <dummy@example.com>
-Date: Tue, 17 Dec 2013 18:08:22 +0000
-Subject: [PATCH] disable TH
+Date: Tue, 14 Oct 2014 01:23:56 +0000
+Subject: [PATCH] hack to build
 
 ---
- Database/Persist/Sql/Raw.hs | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ Database/Persist/Sql/Raw.hs |    6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/Database/Persist/Sql/Raw.hs b/Database/Persist/Sql/Raw.hs
-index 73189dd..d432790 100644
+index 319d75f..db3ee43 100644
 --- a/Database/Persist/Sql/Raw.hs
 +++ b/Database/Persist/Sql/Raw.hs
-@@ -11,7 +11,7 @@ import Data.IORef (writeIORef, readIORef, newIORef)
+@@ -15,7 +15,7 @@ import Data.IORef (writeIORef, readIORef, newIORef)
  import Control.Exception (throwIO)
  import Control.Monad (when, liftM)
  import Data.Text (Text, pack)
--import Control.Monad.Logger (logDebugS)
-+--import Control.Monad.Logger (logDebugS)
+-import Control.Monad.Logger (logDebugS, runLoggingT)
++-- import Control.Monad.Logger (logDebugS, runLoggingT)
  import Data.Int (Int64)
- import Control.Monad.Trans.Class (lift)
  import qualified Data.Text as T
-@@ -22,7 +22,6 @@ rawQuery :: (MonadSqlPersist m, MonadResource m)
-          -> [PersistValue]
-          -> Source m [PersistValue]
- rawQuery sql vals = do
--    lift $ $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals
-     conn <- lift askSqlConn
-     bracketP
-         (getStmtConn conn sql)
-@@ -34,7 +33,6 @@ rawExecute x y = liftM (const ()) $ rawExecuteCount x y
- 
- rawExecuteCount :: MonadSqlPersist m => Text -> [PersistValue] -> m Int64
+ import Data.Conduit
+@@ -39,8 +39,6 @@ rawQueryRes
+ rawQueryRes sql vals = do
+     conn <- ask
+     let make = do
+-            runLoggingT ($logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals)
+-                (connLogFunc conn)
+             getStmtConn conn sql
+     return $ do
+         stmt <- mkAcquire make stmtReset
+@@ -52,8 +50,6 @@ rawExecute x y = liftM (const ()) $ rawExecuteCount x y
+ rawExecuteCount :: MonadIO m => Text -> [PersistValue] -> ReaderT Connection m Int64
  rawExecuteCount sql vals = do
--    $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals
+     conn <- ask
+-    runLoggingT ($logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals)
+-        (connLogFunc conn)
      stmt <- getStmt sql
      res <- liftIO $ stmtExecute stmt vals
      liftIO $ stmtReset stmt
 -- 
-1.8.5.1
+1.7.10.4