@@ -1528,13 +1528,15 @@ data MatchQuery =
15281528 , matchQueryAnalyzer :: Maybe Analyzer
15291529 , matchQueryMaxExpansions :: Maybe MaxExpansions
15301530 , matchQueryLenient :: Maybe Lenient
1531− , matchQueryBoost :: Maybe Boost } deriving (Eq, Read, Show, Generic, Typeable)
1531+ , matchQueryBoost :: Maybe Boost
1532+ , matchQueryMinimumShouldMatch :: Maybe Text
1533+ } deriving (Eq, Read, Show, Generic, Typeable)
15321534
15331535{-| 'mkMatchQuery' is a convenience function that defaults the less common parameters,
15341536 enabling you to provide only the 'FieldName' and 'QueryString' to make a 'MatchQuery'
15351537-}
15361538mkMatchQuery :: FieldName -> QueryString -> MatchQuery
1537−mkMatchQuery field query = MatchQuery field query Or ZeroTermsNone Nothing Nothing Nothing Nothing Nothing Nothing
1539+mkMatchQuery field query = MatchQuery field query Or ZeroTermsNone Nothing Nothing Nothing Nothing Nothing Nothing Nothing
15381540
15391541data MatchQueryType =
15401542 MatchPhrase
@@ -2924,7 +2926,9 @@ instance ToJSON MatchQuery where
29242926 toJSON (MatchQuery (FieldName fieldName)
29252927 (QueryString mqQueryString) booleanOperator
29262928 zeroTermsQuery cutoffFrequency matchQueryType
2927− analyzer maxExpansions lenient boost) =
2929+ analyzer maxExpansions lenient boost
2930+ minShouldMatch
2931+ ) =
29282932 object [ fieldName .= omitNulls base ]
29292933 where base = [ "query" .= mqQueryString
29302934 , "operator" .= booleanOperator
@@ -2934,7 +2938,9 @@ instance ToJSON MatchQuery where
29342938 , "analyzer" .= analyzer
29352939 , "max_expansions" .= maxExpansions
29362940 , "lenient" .= lenient
2937− , "boost" .= boost ]
2941+ , "boost" .= boost
2942+ , "minimum_should_match" .= minShouldMatch
2943+ ]
29382944
29392945instance FromJSON MatchQuery where
29402946 parseJSON = withObject "MatchQuery" parse
@@ -2949,6 +2955,7 @@ instance FromJSON MatchQuery where
29492955 <*> o .:? "max_expansions"
29502956 <*> o .:? "lenient"
29512957 <*> o .:? "boost"
2958+ <*> o .:? "minimum_should_match"
29522959
29532960instance ToJSON MultiMatchQuery where
29542961 toJSON (MultiMatchQuery fields (QueryString query) boolOp