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

Change aliased val to be legal value by waiting until expr materialization in select clause before adding AS <alias>

Browse Source
This commit is contained in:
belevy 2021-01-20 21:28:26 -06:00
parent 2ab733fbee
commit 2d09ae1fe8
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Database/Esqueleto/Experimental/ToAlias.hs
View File

@ -16,15 +16,11 @@ class ToAlias a where
toAlias :: a -> SqlQuery a toAlias :: a -> SqlQuery a
instance ToAlias (SqlExpr (Value a)) where instance ToAlias (SqlExpr (Value a)) where
toAlias (ERaw m f) = toAlias e@(ERaw m f)
case sqlExprMetaAlias m of | Just _ <- sqlExprMetaAlias m, not (sqlExprMetaIsReference m) = pure e
Just _ -> pure $ ERaw m f | otherwise = do
Nothing -> do ident <- newIdentFor (DBName "v")
ident <- newIdentFor (DBName "v") pure $ ERaw noMeta{sqlExprMetaAlias = Just ident} f
pure $ ERaw noMeta{sqlExprMetaAlias = Just ident} $ \_ info ->
let (b, v) = f Never info
in (b <> " AS " <> useIdent info ident, v)
instance ToAlias (SqlExpr (Entity a)) where instance ToAlias (SqlExpr (Entity a)) where
toAlias (ERaw m f) = do toAlias (ERaw m f) = do

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

@ -3044,11 +3044,11 @@ instance PersistField a => SqlSelect (SqlExpr (Value a)) (Value a) where
-- | Materialize a @SqlExpr (Value a)@. -- | Materialize a @SqlExpr (Value a)@.
materializeExpr :: IdentInfo -> SqlExpr (Value a) -> (TLB.Builder, [PersistValue]) materializeExpr :: IdentInfo -> SqlExpr (Value a) -> (TLB.Builder, [PersistValue])
materializeExpr info v materializeExpr info (ERaw m f)
| ERaw m _ <- v, Just f <- sqlExprMetaCompositeFields m = | Just fields <- sqlExprMetaCompositeFields m = (uncommas $ fmap parens $ fields info, [])
let bs = f info | Just alias <- sqlExprMetaAlias m
in (uncommas $ map (parensM Parens) bs, []) , not (sqlExprMetaIsReference m) = first (<> " AS " <> useIdent info alias) (f Parens info)
| ERaw _ f <- v = f Parens info | otherwise = f Parens info
-- | You may return tuples (up to 16-tuples) and tuples of tuples -- | You may return tuples (up to 16-tuples) and tuples of tuples