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

Remove whitespaces from Database.Esqueleto.Internal.Internal

Browse Source
This commit is contained in:
Sebastián Estrella 2020-07-29 20:00:15 -05:00 committed by Matt Parsons
parent 91ab01d76f
commit 29eb443fac
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,16 +524,16 @@ subSelectUnsafe = sub SELECT
(EAliasedEntityReference source base) ^. field = (EAliasedEntityReference source base) ^. field =
EValueReference source (aliasedEntityColumnIdent base fieldDef) EValueReference source (aliasedEntityColumnIdent base fieldDef)
where where
fieldDef = fieldDef =
if isIdField field then if isIdField field then
-- TODO what about composite natural keys in a join this will ignore them -- TODO what about composite natural keys in a join this will ignore them
head $ entityKeyFields ed head $ entityKeyFields ed
else else
persistFieldDef field persistFieldDef field
ed = entityDef $ getEntityVal (Proxy :: Proxy (SqlExpr (Entity val))) ed = entityDef $ getEntityVal (Proxy :: Proxy (SqlExpr (Entity val)))
e ^. field e ^. field
| isIdField field = idFieldValue | isIdField field = idFieldValue
| otherwise = ERaw Never $ \info -> (dot info $ persistFieldDef field, []) | otherwise = ERaw Never $ \info -> (dot info $ persistFieldDef field, [])
where where
@ -548,16 +548,16 @@ e ^. field
ed = entityDef $ getEntityVal (Proxy :: Proxy (SqlExpr (Entity val))) ed = entityDef $ getEntityVal (Proxy :: Proxy (SqlExpr (Entity val)))
dot info fieldDef = dot info fieldDef =
useIdent info sourceIdent <> "." <> fieldIdent useIdent info sourceIdent <> "." <> fieldIdent
where where
sourceIdent = sourceIdent =
case e of case e of
EEntity ident -> ident EEntity ident -> ident
EAliasedEntity baseI _ -> baseI EAliasedEntity baseI _ -> baseI
fieldIdent = fieldIdent =
case e of case e of
EEntity _ -> fromDBName info (fieldDB fieldDef) EEntity _ -> fromDBName info (fieldDB fieldDef)
EAliasedEntity baseI _ -> useIdent info $ aliasedEntityColumnIdent baseI fieldDef info EAliasedEntity baseI _ -> useIdent info $ aliasedEntityColumnIdent baseI fieldDef info
-- | Project an SqlExpression that may be null, guarding against null cases. -- | Project an SqlExpression that may be null, guarding against null cases.
@ -580,13 +580,13 @@ val v = ERaw Never $ const ("?", [toPersistValue v])
-- | @IS NULL@ comparison. -- | @IS NULL@ comparison.
isNothing :: PersistField typ => SqlExpr (Value (Maybe typ)) -> SqlExpr (Value Bool) isNothing :: PersistField typ => SqlExpr (Value (Maybe typ)) -> SqlExpr (Value Bool)
isNothing v = isNothing v =
case v of case v of
ERaw p f -> isNullExpr $ first (parensM p) . f ERaw p f -> isNullExpr $ first (parensM p) . f
EAliasedValue i _ -> isNullExpr $ aliasedValueIdentToRawSql i EAliasedValue i _ -> isNullExpr $ aliasedValueIdentToRawSql i
EValueReference i i' -> isNullExpr $ valueReferenceToRawSql i i' EValueReference i i' -> isNullExpr $ valueReferenceToRawSql i i'
ECompositeKey f -> ERaw Parens $ flip (,) [] . (intersperseB " AND " . map (<> " IS NULL")) . f ECompositeKey f -> ERaw Parens $ flip (,) [] . (intersperseB " AND " . map (<> " IS NULL")) . f
where where
isNullExpr :: (IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value Bool) isNullExpr :: (IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value Bool)
isNullExpr g = ERaw Parens $ first ((<> " IS NULL")) . g isNullExpr g = ERaw Parens $ first ((<> " IS NULL")) . g
@ -612,14 +612,14 @@ joinV (EAliasedValue i v) = EAliasedValue i (joinV v)
joinV (EValueReference i i') = EValueReference i i' joinV (EValueReference i i') = EValueReference i i'
countHelper :: Num a => TLB.Builder -> TLB.Builder -> SqlExpr (Value typ) -> SqlExpr (Value a) countHelper :: Num a => TLB.Builder -> TLB.Builder -> SqlExpr (Value typ) -> SqlExpr (Value a)
countHelper open close v = countHelper open close v =
case v of case v of
ERaw _ f -> countRawSql f ERaw _ f -> countRawSql f
EAliasedValue i _ -> countRawSql $ aliasedValueIdentToRawSql i EAliasedValue i _ -> countRawSql $ aliasedValueIdentToRawSql i
EValueReference i i' -> countRawSql $ valueReferenceToRawSql i i' EValueReference i i' -> countRawSql $ valueReferenceToRawSql i i'
ECompositeKey _ -> countRows ECompositeKey _ -> countRows
where where
countRawSql :: (IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value a) countRawSql :: (IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value a)
countRawSql x = ERaw Never $ first (\b -> "COUNT" <> open <> parens b <> close) . x countRawSql x = ERaw Never $ first (\b -> "COUNT" <> open <> parens b <> close) . x
@ -941,7 +941,7 @@ field /=. expr = setAux field (\ent -> ent ^. field /. expr)
let (fb, fv) = f x let (fb, fv) = f x
(gb, gv) = g x (gb, gv) = g x
in (fb <> ", " <> gb, fv ++ gv) in (fb <> ", " <> gb, fv ++ gv)
where where
g = g =
case v of case v of
ERaw _ f' -> f' ERaw _ f' -> f'
@ -1938,7 +1938,7 @@ data SqlExpr a where
EEntity :: Ident -> SqlExpr (Entity val) EEntity :: Ident -> SqlExpr (Entity val)
-- Base Table -- Base Table
EAliasedEntity :: Ident -> Ident -> SqlExpr (Entity val) EAliasedEntity :: Ident -> Ident -> SqlExpr (Entity val)
-- Source Base -- Source Base
EAliasedEntityReference :: Ident -> Ident -> SqlExpr (Entity val) EAliasedEntityReference :: Ident -> Ident -> SqlExpr (Entity val)
-- Just a tag stating that something is nullable. -- Just a tag stating that something is nullable.
@ -1952,7 +1952,7 @@ data SqlExpr a where
ERaw :: NeedParens -> (IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value a) ERaw :: NeedParens -> (IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr (Value a)
-- A raw expression with an alias -- A raw expression with an alias
EAliasedValue :: Ident -> SqlExpr (Value a) -> SqlExpr (Value a) EAliasedValue :: Ident -> SqlExpr (Value a) -> SqlExpr (Value a)
-- A reference to an aliased field in a table or subquery -- A reference to an aliased field in a table or subquery
@ -2090,14 +2090,14 @@ unsafeSqlCase when v = ERaw Never buildCase
foldHelp _ _ (ECompositeKey _, _) = throw (CompositeKeyErr FoldHelpError) foldHelp _ _ (ECompositeKey _, _) = throw (CompositeKeyErr FoldHelpError)
foldHelp _ _ (_, ECompositeKey _) = throw (CompositeKeyErr FoldHelpError) foldHelp _ _ (_, ECompositeKey _) = throw (CompositeKeyErr FoldHelpError)
foldHelp info (b0, vals0) (v1, v2) = foldHelp info (b0, vals0) (v1, v2) =
let (b1, vals1) = valueToSql v1 info let (b1, vals1) = valueToSql v1 info
(b2, vals2) = valueToSql v2 info (b2, vals2) = valueToSql v2 info
in ( b0 <> " WHEN " <> b1 <> " THEN " <> b2, vals0 <> vals1 <> vals2 ) in ( b0 <> " WHEN " <> b1 <> " THEN " <> b2, vals0 <> vals1 <> vals2 )
valueToSql :: SqlExpr (Value a) -> IdentInfo -> (TLB.Builder, [PersistValue]) valueToSql :: SqlExpr (Value a) -> IdentInfo -> (TLB.Builder, [PersistValue])
valueToSql (ERaw p f) = (first (parensM p)) . f valueToSql (ERaw p f) = (first (parensM p)) . f
valueToSql (ECompositeKey _) = throw (CompositeKeyErr SqlCaseError) valueToSql (ECompositeKey _) = throw (CompositeKeyErr SqlCaseError)
valueToSql (EAliasedValue i _) = aliasedValueIdentToRawSql i valueToSql (EAliasedValue i _) = aliasedValueIdentToRawSql i
valueToSql (EValueReference i i') = valueReferenceToRawSql i i' valueToSql (EValueReference i i') = valueReferenceToRawSql i i'
-- | (Internal) Create a custom binary operator. You /should/ -- | (Internal) Create a custom binary operator. You /should/
@ -2129,10 +2129,10 @@ unsafeSqlBinOp op a b = unsafeSqlBinOp op (construct a) (construct b)
in build (parensM p b1, vals) in build (parensM p b1, vals)
construct (ECompositeKey f) = construct (ECompositeKey f) =
ERaw Parens $ \info -> (uncommas $ f info, mempty) ERaw Parens $ \info -> (uncommas $ f info, mempty)
construct (EAliasedValue i _) = construct (EAliasedValue i _) =
ERaw Never $ aliasedValueIdentToRawSql i ERaw Never $ aliasedValueIdentToRawSql i
construct (EValueReference i i') = construct (EValueReference i i') =
ERaw Never $ valueReferenceToRawSql i i' ERaw Never $ valueReferenceToRawSql i i'
{-# INLINE unsafeSqlBinOp #-} {-# INLINE unsafeSqlBinOp #-}
@ -2353,7 +2353,7 @@ veryUnsafeCoerceSqlExprValue :: SqlExpr (Value a) -> SqlExpr (Value b)
veryUnsafeCoerceSqlExprValue (ERaw p f) = ERaw p f veryUnsafeCoerceSqlExprValue (ERaw p f) = ERaw p f
veryUnsafeCoerceSqlExprValue (ECompositeKey f) = ECompositeKey f veryUnsafeCoerceSqlExprValue (ECompositeKey f) = ECompositeKey f
veryUnsafeCoerceSqlExprValue (EAliasedValue i v) = EAliasedValue i (veryUnsafeCoerceSqlExprValue v) veryUnsafeCoerceSqlExprValue (EAliasedValue i v) = EAliasedValue i (veryUnsafeCoerceSqlExprValue v)
veryUnsafeCoerceSqlExprValue (EValueReference i i') = EValueReference i i' veryUnsafeCoerceSqlExprValue (EValueReference i i') = EValueReference i i'
-- | (Internal) Coerce a value's type from 'SqlExpr (ValueList -- | (Internal) Coerce a value's type from 'SqlExpr (ValueList
@ -2754,7 +2754,7 @@ makeFrom info mode fs = ret
, maybe mempty makeOnClause monClause , maybe mempty makeOnClause monClause
] ]
mk _ (OnClause _) = throw (UnexpectedCaseErr MakeFromError) mk _ (OnClause _) = throw (UnexpectedCaseErr MakeFromError)
mk _ (FromQuery ident f) = mk _ (FromQuery ident f) =
let (queryText, queryVals) = f info let (queryText, queryVals) = f info
in ((parens queryText) <> " AS " <> useIdent info ident, queryVals) in ((parens queryText) <> " AS " <> useIdent info ident, queryVals)
@ -2798,7 +2798,7 @@ makeWhere _ NoWhere = mempty
makeWhere info (Where v) = first ("\nWHERE " <>) $ x info makeWhere info (Where v) = first ("\nWHERE " <>) $ x info
where where
x = x =
case v of case v of
ERaw _ f -> f ERaw _ f -> f
EAliasedValue i _ -> aliasedValueIdentToRawSql i EAliasedValue i _ -> aliasedValueIdentToRawSql i
EValueReference i i' -> valueReferenceToRawSql i i' EValueReference i i' -> valueReferenceToRawSql i i'
@ -2822,7 +2822,7 @@ makeHaving _ NoWhere = mempty
makeHaving info (Where v) = first ("\nHAVING " <>) $ x info makeHaving info (Where v) = first ("\nHAVING " <>) $ x info
where where
x = x =
case v of case v of
ERaw _ f -> f ERaw _ f -> f
EAliasedValue i _ -> aliasedValueIdentToRawSql i EAliasedValue i _ -> aliasedValueIdentToRawSql i
EValueReference i i' -> valueReferenceToRawSql i i' EValueReference i i' -> valueReferenceToRawSql i i'
@ -2839,11 +2839,11 @@ makeOrderByNoNewline info os = first ("ORDER BY " <>) . uncommas' $ concatMap mk
let fs = f info let fs = f info
vals = repeat [] vals = repeat []
in zip (map (<> orderByType t) fs) vals in zip (map (<> orderByType t) fs) vals
mk (EOrderBy t v) = mk (EOrderBy t v) =
let x = case v of let x = case v of
ERaw p f -> (first (parensM p)) . f ERaw p f -> (first (parensM p)) . f
EAliasedValue i _ -> aliasedValueIdentToRawSql i EAliasedValue i _ -> aliasedValueIdentToRawSql i
EValueReference i i' -> valueReferenceToRawSql i i' EValueReference i i' -> valueReferenceToRawSql i i'
ECompositeKey _ -> undefined -- defined above ECompositeKey _ -> undefined -- defined above
in [ first (<> orderByType t) $ x info ] in [ first (<> orderByType t) $ x info ]
mk EOrderRandom = [first (<> "RANDOM()") mempty] mk EOrderRandom = [first (<> "RANDOM()") mempty]
@ -2892,8 +2892,8 @@ aliasedEntityColumnIdent :: Ident -> FieldDef -> IdentInfo -> Ident
aliasedEntityColumnIdent (I baseIdent) field info = aliasedEntityColumnIdent (I baseIdent) field info =
I (baseIdent <> "_" <> (builderToText $ fromDBName info $ fieldDB field)) I (baseIdent <> "_" <> (builderToText $ fromDBName info $ fieldDB field))
aliasedColumnName :: Ident -> IdentInfo -> T.Text -> TLB.Builder aliasedColumnName :: Ident -> IdentInfo -> T.Text -> TLB.Builder
aliasedColumnName (I baseIdent) info columnName = aliasedColumnName (I baseIdent) info columnName =
useIdent info (I (baseIdent <> "_" <> columnName)) useIdent info (I (baseIdent <> "_" <> columnName))
---------------------------------------------------------------------- ----------------------------------------------------------------------
@ -2965,7 +2965,7 @@ instance PersistEntity a => SqlSelect (SqlExpr (Entity a)) (Entity a) where
process ed = uncommas $ process ed = uncommas $
map ((name <>) . aliasName) $ map ((name <>) . aliasName) $
entityColumnNames ed (fst info) entityColumnNames ed (fst info)
aliasName columnName = (TLB.fromText columnName) <> " AS " <> aliasedColumnName aliasIdent info columnName aliasName columnName = (TLB.fromText columnName) <> " AS " <> aliasedColumnName aliasIdent info columnName
name = useIdent info tableIdent <> "." name = useIdent info tableIdent <> "."
ret = let ed = entityDef $ getEntityVal $ return expr ret = let ed = entityDef $ getEntityVal $ return expr
in (process ed, mempty) in (process ed, mempty)
@ -3558,9 +3558,9 @@ renderExpr sqlBackend e =
. mconcat . mconcat
. mkInfo . mkInfo
$ (sqlBackend, initialIdentState) $ (sqlBackend, initialIdentState)
EAliasedValue i _ -> EAliasedValue i _ ->
builderToText $ useIdent (sqlBackend, initialIdentState) i builderToText $ useIdent (sqlBackend, initialIdentState) i
EValueReference i i' -> EValueReference i i' ->
let (builder, _) = valueReferenceToRawSql i i' (sqlBackend, initialIdentState) let (builder, _) = valueReferenceToRawSql i i' (sqlBackend, initialIdentState)
in (builderToText builder) in (builderToText builder)
-- | An exception thrown by 'RenderExpr' - it's not designed to handle composite -- | An exception thrown by 'RenderExpr' - it's not designed to handle composite