b92afa7 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Fixed merge.. oops

commitb92afa7b6d5ac8e869cce3f00e1799f37cd7ca32 authorLiam Atkinson <liamatkinson@gmail.com> dateWed 19 Nov 2014, 20:23 (12 years ago) parent6832d1e

3 files changed+2−2

unifiedsplit

Database/Bloodhound/Client.hs+1−1

@@ -250,7 +250,7 @@ searchByType (Server server) (IndexName indexName)

250250 url = joinPath [server, indexName, mappingName, "_search"]

251251

252252mkSearch :: Maybe Query -> Maybe Filter -> Search

253−mkSearch query filter = Search query filter Nothing Nothing Nothing False 0 0

253+mkSearch query filter = Search query filter Nothing Nothing Nothing False 0 10

254254

255255mkAggregateSearch :: Maybe Query -> Aggregations -> Search

256256mkAggregateSearch query mkSearchAggs = Search query Nothing Nothing (Just mkSearchAggs) Nothing False 0 0

Database/Bloodhound/Types.hs−1

@@ -1,5 +1,4 @@

11{-# LANGUAGE DeriveGeneric #-}

2−

32{-# LANGUAGE RecordWildCards #-}

54{-| Data types for describing actions and data structures performed to interact

tests/tests.hs+1

@@ -21,6 +21,7 @@ import Network.HTTP.Client

2121import qualified Network.HTTP.Types.Status as NHTS

2222import Prelude hiding (filter, putStrLn)

2323import Test.Hspec

24+

2425import Test.Hspec.QuickCheck (prop)

2526import Test.QuickCheck

2627