6357679 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

on master help sign in

Fix incompatibility with uri-bytestring api

6357679Michael Xavier12 years ago

src/Database/Bloodhound/Client.hs+1−4

compare with master

unifiedsplit

@@ -55,11 +55,9 @@ import Control.Monad

55import Control.Monad.Catch

56import Control.Monad.IO.Class

57import Data.Aeson

58−import qualified Data.ByteString.Char8 as B8

59import Data.ByteString.Lazy.Builder

58import Data.ByteString.Lazy.Builder

60import qualified Data.ByteString.Lazy.Char8 as L

59import qualified Data.ByteString.Lazy.Char8 as L

61import Data.Default.Class

60import Data.Default.Class

62−import Data.List (intercalate)

63import Data.Maybe (fromMaybe)

61import Data.Maybe (fromMaybe)

64import Data.Text (Text)

62import Data.Text (Text)

65import qualified Data.Text as T

63import qualified Data.Text as T

@@ -70,7 +68,6 @@ import qualified Network.HTTP.Types.Method as NHTM

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

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

71import Prelude hiding (filter, head)

69import Prelude hiding (filter, head)

72import URI.ByteString hiding (Query)

70import URI.ByteString hiding (Query)

73−import qualified URI.ByteString as UB

75import Database.Bloodhound.Types

72import Database.Bloodhound.Types

@@ -526,7 +523,7 @@ setURI req URI{..} = do

526 , port = thePort

523 , port = thePort

527 , path = uriPath

524 , path = uriPath

528 }

525 }

529− thePort = maybe defPort (read . B8.unpack . getPort) authorityPort

526+ thePort = maybe defPort getPort authorityPort

530 addAuth = maybe id addAuth' authorityUserInfo

527 addAuth = maybe id addAuth' authorityUserInfo

531 return $ setQueryString theQueryString $ addAuth req'

528 return $ setQueryString theQueryString $ addAuth req'

532 where

529 where

src/Database/Bloodhound/Types.hs+1

@@ -258,6 +258,7 @@ newtype BH m a = BH {

258 , MonadState s

259 , MonadWriter w

260 , MonadError e

261+ , Alternative

261 , MonadPlus

262 , MonadPlus

262 , MonadFix)

263 , MonadFix)

263

264