jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify checking object keys for equality

Browse Source
This commit is contained in:
Joe Nelson
2015-11-22 15:00:28 -08:00
parent 1f6fc5cbd8
commit d03d68c25f
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/RequestIntent.hs
+5 -10
View File
@@ -201,19 +201,14 @@ ensureUniform :: JSON.Array -> Maybe UniformObjects
ensureUniform arr = ensureUniform arr =
let objs :: V.Vector JSON.Object let objs :: V.Vector JSON.Object
objs = foldr -- filter non-objects, map to raw objects objs = foldr -- filter non-objects, map to raw objects
(\result val -> case val of (\val result -> case val of
JSON.Object o -> V.cons o result JSON.Object o -> V.cons o result
_ -> result) _ -> result)
V.empty arr V.empty arr
keysPerObj :: [S.Set T.Text] keysPerObj = V.map (S.fromList . M.keys) objs
keysPerObj = V.toList $ V.map (S.fromList . M.keys) objs canonicalKeys = fromMaybe S.empty $ keysPerObj V.!? 0
allKeys :: S.Set T.Text areKeysUniform = all (==canonicalKeys) keysPerObj in
allKeys = S.unions keysPerObj
commonKeys :: S.Set T.Text
commonKeys = case keysPerObj of
h : _ -> foldr S.intersection h keysPerObj
[] -> S.empty in
if (length objs == length arr) && (allKeys == commonKeys) if (V.length objs == V.length arr) && areKeysUniform
then Just (UniformObjects objs) then Just (UniformObjects objs)
else Nothing else Nothing