Minor fixes.

This commit is contained in:
Danny B 2012-09-24 00:28:35 +11:00
parent 8a79bdaad1
commit cc88aa701e

View File

@ -93,9 +93,9 @@ type SqlEntity ent = (PersistEntity ent, PersistEntityBackend ent ~ SqlPersist)
data SideData = SideData { sdFromClause :: ![FromClause] data SideData = SideData { sdFromClause :: ![FromClause]
, sdSetClause :: ![SetClause] , sdSetClause :: ![SetClause]
, sdWhereClause :: !WhereClause , sdWhereClause :: !WhereClause
, sdGroupByClause :: !GroupByClause
, sdOrderByClause :: ![OrderByClause] , sdOrderByClause :: ![OrderByClause]
, sdLimitClause :: !LimitClause , sdLimitClause :: !LimitClause
, sdGroupByClause :: !GroupByClause
} }
instance Monoid SideData where instance Monoid SideData where
@ -155,7 +155,7 @@ instance Monoid WhereClause where
-- | A @GROUP BY@ clause. -- | A @GROUP BY@ clause.
data GroupByClause = GroupBy [SomeValue SqlExpr] newtype GroupByClause = GroupBy [SomeValue SqlExpr]
instance Monoid GroupByClause where instance Monoid GroupByClause where
mempty = GroupBy [] mempty = GroupBy []
@ -631,7 +631,7 @@ builderToText = TL.toStrict . TLB.toLazyTextWith defaultChunkSize
-- @persistent@. -- @persistent@.
toRawSql :: SqlSelect a r => Mode -> Connection -> SqlQuery a -> (TLB.Builder, [PersistValue]) toRawSql :: SqlSelect a r => Mode -> Connection -> SqlQuery a -> (TLB.Builder, [PersistValue])
toRawSql mode conn query = toRawSql mode conn query =
let (ret, SideData fromClauses setClauses whereClauses orderByClauses limitClause groupByClause) = let (ret, SideData fromClauses setClauses whereClauses groupByClause orderByClauses limitClause) =
flip S.evalState initialIdentState $ flip S.evalState initialIdentState $
W.runWriterT $ W.runWriterT $
unQ query unQ query