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

Remove EOrderByRandom, calling distinctOnOrderBy with rand will choke the db but you shouldnt be using rand anyway. distinctOnOrderBy seems dangerous though

Browse Source
This commit is contained in:
belevy 2021-01-19 09:51:23 -06:00
parent 2da0526b90
commit c9eb845568
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,14 +364,12 @@ distinctOnOrderBy exprs act =
where where
toDistinctOn :: SqlExpr OrderBy -> SqlExpr DistinctOn toDistinctOn :: SqlExpr OrderBy -> SqlExpr DistinctOn
toDistinctOn (ERaw m f) = ERaw m f toDistinctOn (ERaw m f) = ERaw m f
toDistinctOn EOrderRandom =
error "We can't select distinct by a random order!"
-- | @ORDER BY random()@ clause. -- | @ORDER BY random()@ clause.
-- --
-- @since 1.3.10 -- @since 1.3.10
rand :: SqlExpr OrderBy rand :: SqlExpr OrderBy
rand = EOrderRandom rand = ERaw noMeta $ \_ _ -> ("RANDOM()", [])
-- | @HAVING@. -- | @HAVING@.
-- --
@ -2071,8 +2069,6 @@ data SqlExpr a where
-- interpolated by the SQL backend. -- interpolated by the SQL backend.
ERaw :: SqlExprMeta -> (NeedParens -> IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr a ERaw :: SqlExprMeta -> (NeedParens -> IdentInfo -> (TLB.Builder, [PersistValue])) -> SqlExpr a
EOrderRandom :: SqlExpr OrderBy
-- A 'SqlExpr' accepted only by 'set'. -- A 'SqlExpr' accepted only by 'set'.
ESet :: (SqlExpr (Entity val) -> SqlExpr (Value ())) -> SqlExpr (Update val) ESet :: (SqlExpr (Entity val) -> SqlExpr (Value ())) -> SqlExpr (Update val)
@ -2909,7 +2905,6 @@ makeOrderByNoNewline info os = first ("ORDER BY " <>) . uncommas' $ concatMap mk
where where
mk :: OrderByClause -> [(TLB.Builder, [PersistValue])] mk :: OrderByClause -> [(TLB.Builder, [PersistValue])]
mk (ERaw _ f) = [f Never info] mk (ERaw _ f) = [f Never info]
mk EOrderRandom = [first (<> "RANDOM()") mempty]
orderByType ASC = " ASC" orderByType ASC = " ASC"
orderByType DESC = " DESC" orderByType DESC = " DESC"
@ -2920,8 +2915,6 @@ makeOrderBy info is =
let (tlb, vals) = makeOrderByNoNewline info is let (tlb, vals) = makeOrderByNoNewline info is
in ("\n" <> tlb, vals) in ("\n" <> tlb, vals)
{-# DEPRECATED EOrderRandom "Since 2.6.0: `rand` ordering function is not uniform across all databases! To avoid accidental partiality it will be removed in the next major version." #-}
makeLimit :: IdentInfo -> LimitClause -> [OrderByClause] -> (TLB.Builder, [PersistValue]) makeLimit :: IdentInfo -> LimitClause -> [OrderByClause] -> (TLB.Builder, [PersistValue])
makeLimit (conn, _) (Limit ml mo) orderByClauses = makeLimit (conn, _) (Limit ml mo) orderByClauses =
let limitRaw = connLimitOffset conn (v ml, v mo) hasOrderClause "\n" let limitRaw = connLimitOffset conn (v ml, v mo) hasOrderClause "\n"