haskell/esqueleto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
parsonsmatt 2020-10-29 07:27:10 -06:00
parent 31f7b7f6c3
commit 17b0da892f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Database/Esqueleto/Experimental.hs
View File

@ -1189,20 +1189,20 @@ from parts = do
(o2', _ ) <- aliasQueries o2 (o2', _ ) <- aliasQueries o2
pure (SqlSetIntersect o1' o2', ret) pure (SqlSetIntersect o1' o2', ret)
operationToSql o info = operationToSql o info =
case o of case o of
SelectQueryP p q -> SelectQueryP p q ->
let (builder, values) = toRawSql SELECT info q let (builder, values) = toRawSql SELECT info q
in (parensM p builder, values) in (parensM p builder, values)
SqlSetUnion o1 o2 -> doSetOperation "UNION" info o1 o2 SqlSetUnion o1 o2 -> doSetOperation "UNION" info o1 o2
SqlSetUnionAll o1 o2 -> doSetOperation "UNION ALL" info o1 o2 SqlSetUnionAll o1 o2 -> doSetOperation "UNION ALL" info o1 o2
SqlSetExcept o1 o2 -> doSetOperation "EXCEPT" info o1 o2 SqlSetExcept o1 o2 -> doSetOperation "EXCEPT" info o1 o2
SqlSetIntersect o1 o2 -> doSetOperation "INTERSECT" info o1 o2 SqlSetIntersect o1 o2 -> doSetOperation "INTERSECT" info o1 o2
doSetOperation operationText info o1 o2 = doSetOperation operationText info o1 o2 =
let (q1, v1) = operationToSql o1 info let (q1, v1) = operationToSql o1 info
(q2, v2) = operationToSql o2 info (q2, v2) = operationToSql o2 info
in (q1 <> " " <> operationText <> " " <> q2, v1 <> v2) in (q1 <> " " <> operationText <> " " <> q2, v1 <> v2)
runFrom (InnerJoinFrom leftPart (rightPart, on')) = do runFrom (InnerJoinFrom leftPart (rightPart, on')) = do
(leftVal, leftFrom) <- runFrom leftPart (leftVal, leftFrom) <- runFrom leftPart

6
src/Database/Esqueleto/Internal/Internal.hs
View File

@ -26,7 +26,7 @@ module Database.Esqueleto.Internal.Internal where
import Control.Applicative ((<|>)) import Control.Applicative ((<|>))
import Control.Arrow (first, (***)) import Control.Arrow (first, (***))
import Control.Exception (Exception, throw, throwIO) import Control.Exception (Exception, throw, throwIO)
import Control.Monad (MonadPlus(..), ap, guard, void) import Control.Monad (MonadPlus(..), guard, void)
import Control.Monad.IO.Class (MonadIO(..)) import Control.Monad.IO.Class (MonadIO(..))
import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Class (lift)
import Control.Monad.Trans.Resource (MonadResource, release) import Control.Monad.Trans.Resource (MonadResource, release)
@ -2889,7 +2889,7 @@ makeFrom info mode fs = ret
base ident@(I identText) def = base ident@(I identText) def =
let db@(DBName dbText) = entityDB def let db@(DBName dbText) = entityDB def
in ( fromDBNameinfo db <> in ( fromDBName info db <>
if dbText == identText if dbText == identText
then mempty then mempty
else " AS " <> useIdent info ident else " AS " <> useIdent info ident
@ -3073,7 +3073,7 @@ instance SqlSelect () () where
unescapedColumnNames :: EntityDef -> [DBName] unescapedColumnNames :: EntityDef -> [DBName]
unescapedColumnNames ent = unescapedColumnNames ent =
(if hasCompositeKey ent then id else ( fieldDB (entityId ent) :)) (if hasCompositeKey ent then id else ( fieldDB (entityId ent) :))
<> map fieldDB (entityFields ent) $ map fieldDB (entityFields ent)
-- | You may return an 'Entity' from a 'select' query. -- | You may return an 'Entity' from a 'select' query.
instance PersistEntity a => SqlSelect (SqlExpr (Entity a)) (Entity a) where instance PersistEntity a => SqlSelect (SqlExpr (Entity a)) (Entity a) where