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

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

@ -26,7 +26,7 @@ module Database.Esqueleto.Internal.Internal where
import Control.Applicative ((<|>))
import Control.Arrow (first, (***))
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.Trans.Class (lift)
import Control.Monad.Trans.Resource (MonadResource, release)
@ -2889,7 +2889,7 @@ makeFrom info mode fs = ret
base ident@(I identText) def =
let db@(DBName dbText) = entityDB def
in ( fromDBNameinfo db <>
in ( fromDBName info db <>
if dbText == identText
then mempty
else " AS " <> useIdent info ident
@ -3073,7 +3073,7 @@ instance SqlSelect () () where
unescapedColumnNames :: EntityDef -> [DBName]
unescapedColumnNames 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.
instance PersistEntity a => SqlSelect (SqlExpr (Entity a)) (Entity a) where