@@ -9,12 +9,12 @@ module Database.V5.Bloodhound.Internal.Query
10import Bloodhound.Import
10import Bloodhound.Import
12−import Data.Char (isNumber)
12+import Data.Char (isNumber)
13−import qualified Data.HashMap.Strict as HM
13+import qualified Data.HashMap.Strict as HM
14−import Data.List (nub)
14+import Data.List (nub)
15−import qualified Data.Text as T
15+import qualified Data.Text as T
17−import Database.Bloodhound.Common.Script as X
17+import Database.Bloodhound.Common.Script as X
18import Database.V5.Bloodhound.Internal.Newtypes
18import Database.V5.Bloodhound.Internal.Newtypes
20data Query =
20data Query =
@@ -834,16 +834,16 @@ instance FromJSON DisMaxQuery where
834 <*> o .:? "boost"
834 <*> o .:? "boost"
836data MatchQuery = MatchQuery
836data MatchQuery = MatchQuery
837− { matchQueryField :: FieldName
837+ { matchQueryField :: FieldName
838− , matchQueryQueryString :: QueryString
838+ , matchQueryQueryString :: QueryString
839− , matchQueryOperator :: BooleanOperator
839+ , matchQueryOperator :: BooleanOperator
840− , matchQueryZeroTerms :: ZeroTermsQuery
840+ , matchQueryZeroTerms :: ZeroTermsQuery
841− , matchQueryCutoffFrequency :: Maybe CutoffFrequency
841+ , matchQueryCutoffFrequency :: Maybe CutoffFrequency
842− , matchQueryMatchType :: Maybe MatchQueryType
842+ , matchQueryMatchType :: Maybe MatchQueryType
843− , matchQueryAnalyzer :: Maybe Analyzer
843+ , matchQueryAnalyzer :: Maybe Analyzer
844− , matchQueryMaxExpansions :: Maybe MaxExpansions
844+ , matchQueryMaxExpansions :: Maybe MaxExpansions
845− , matchQueryLenient :: Maybe Lenient
845+ , matchQueryLenient :: Maybe Lenient
846− , matchQueryBoost :: Maybe Boost
846+ , matchQueryBoost :: Maybe Boost
847 , matchQueryMinimumShouldMatch :: Maybe Text
847 , matchQueryMinimumShouldMatch :: Maybe Text
848 , matchQueryFuzziness :: Maybe Fuzziness
848 , matchQueryFuzziness :: Maybe Fuzziness
849 } deriving (Eq, Show)
849 } deriving (Eq, Show)
@@ -1635,5 +1635,4 @@ instance ToJSON Fuzziness where
1636instance FromJSON Fuzziness where
1636instance FromJSON Fuzziness where
1637 parseJSON (String "AUTO") = return FuzzinessAuto
1637 parseJSON (String "AUTO") = return FuzzinessAuto
1638− parseJSON (String "auto") = return FuzzinessAuto
1639− parseJSON v = Fuzziness <$> parseJSON v
1638+ parseJSON v = Fuzziness <$> parseJSON v