From da40706163b628767dcfa4673373398a9b09cde5 Mon Sep 17 00:00:00 2001 From: Philipp Balzarek Date: Tue, 21 Apr 2015 17:45:44 +0200 Subject: [PATCH] fix rendering of joins --- src/Database/Esqueleto/Internal/Sql.hs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs index 4876334..99705e7 100644 --- a/src/Database/Esqueleto/Internal/Sql.hs +++ b/src/Database/Esqueleto/Internal/Sql.hs @@ -934,19 +934,20 @@ makeFrom info mode fs = ret where ret = case collectOnClauses fs of Left expr -> throw $ mkExc expr - Right fs' -> keyword $ uncommas' (map (mk Never mempty) fs') + Right fs' -> keyword $ uncommas' (map (mk Never) fs') keyword = case mode of UPDATE -> id _ -> first ("\nFROM " <>) - mk _ onClause (FromStart i def) = base i def <> onClause - mk paren onClause (FromJoin lhs kind rhs monClause) = + mk _ (FromStart i def) = base i def + mk paren (FromJoin lhs kind rhs monClause) = first (parensM paren) $ - mconcat [ mk Parens onClause lhs + mconcat [ mk Never lhs , (fromKind kind, mempty) - , mk Never (maybe mempty makeOnClause monClause) rhs + , mk Parens rhs + , maybe mempty makeOnClause monClause ] - mk _ _ (OnClause _) = error "Esqueleto/Sql/makeFrom: never here (is collectOnClauses working?)" + mk _ (OnClause _) = error "Esqueleto/Sql/makeFrom: never here (is collectOnClauses working?)" base ident@(I identText) def = let db@(DBName dbText) = entityDB def