android rebuild WIP

This commit is contained in:
Joey Hess 2014-10-15 14:37:21 -04:00
parent 6b08fdc818
commit 4f62c5358c
7 changed files with 199 additions and 214 deletions

View file

@ -1,43 +1,41 @@
From ec2543b2156dc968530ad98e33d26f741a479e31 Mon Sep 17 00:00:00 2001
From aae3ace106cf26c931cc94c96fb6fbfe83f950f2 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
Date: Tue, 14 Oct 2014 01:23:56 +0000
Subject: [PATCH] hack to build
Date: Wed, 15 Oct 2014 17:05:37 +0000
Subject: [PATCH] avoid TH
---
Database/Persist/Sql/Raw.hs | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
Database/Persist/Sql/Raw.hs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Database/Persist/Sql/Raw.hs b/Database/Persist/Sql/Raw.hs
index 319d75f..db3ee43 100644
index 3ac2ca9..bcc2011 100644
--- a/Database/Persist/Sql/Raw.hs
+++ b/Database/Persist/Sql/Raw.hs
@@ -15,7 +15,7 @@ import Data.IORef (writeIORef, readIORef, newIORef)
@@ -11,7 +11,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, runLoggingT)
+-- import Control.Monad.Logger (logDebugS, runLoggingT)
-import Control.Monad.Logger (logDebugS)
+--import Control.Monad.Logger (logDebugS)
import Data.Int (Int64)
import Control.Monad.Trans.Class (lift)
import qualified Data.Text as T
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
@@ -23,7 +23,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)
@@ -35,7 +34,6 @@ rawExecute x y = liftM (const ()) $ rawExecuteCount x y
rawExecuteCount :: MonadSqlPersist m => Text -> [PersistValue] -> m Int64
rawExecuteCount sql vals = do
conn <- ask
- runLoggingT ($logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals)
- (connLogFunc conn)
- $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals
stmt <- getStmt sql
res <- liftIO $ stmtExecute stmt vals
liftIO $ stmtReset stmt
--
1.7.10.4
2.1.1