@@ -54,6 +54,7 @@ module Database.Bloodhound.Client
5454 )
5555 where
5656
57+import qualified Blaze.ByteString.Builder as BB
5758import Control.Applicative
5859import Control.Monad
5960import Control.Monad.Catch
@@ -72,6 +73,7 @@ import qualified Data.Vector as V
7273import Network.HTTP.Client
7374import qualified Network.HTTP.Types.Method as NHTM
7475import qualified Network.HTTP.Types.Status as NHTS
76+import qualified Network.HTTP.Types.URI as NHTU
7577import Prelude hiding (filter, head)
7678import URI.ByteString hiding (Query)
7779
@@ -168,11 +170,12 @@ joinPath ps = do
168170
169171-- | Severely dumbed down query renderer. Assumes your data doesn't
170172-- need any encoding
171−addQuery :: [(Text, Text)] -> Text -> Text
172−addQuery ps u = u <> "?" <> params
173+addQuery :: [(Text, Maybe Text)] -> Text -> Text
174+addQuery q u = u <> rendered
173175 where
174− params = T.intercalate "&" (uncurry mkParam <$> ps)
175− mkParam k v = k <> "=" <> v
176+ rendered =
177+ T.decodeUtf8 $ BB.toByteString $ NHTU.renderQueryText prependQuestionMark q
178+ prependQuestionMark = True
176179
177180
178181bindM2 :: (Applicative m, Monad m) => (a -> b -> m c) -> m a -> m b -> m c
@@ -346,7 +349,9 @@ indexDocument (IndexName indexName)
346349 ExternalGTE (ExternalDocVersion v) -> versionParams v "external_gte"
347350 ForceVersion (ExternalDocVersion v) -> versionParams v "force"
348351 vt = T.pack . show . docVersionNumber
349− versionParams v t = [("version", vt v), ("version_type", t)]
352+ versionParams v t = [ ("version", Just $ vt v)
353+ , ("version_type", Just t)
354+ ]
350355 body = Just (encode document)
351356
352357-- | 'deleteDocument' is the primary way to delete a single document.