@@ -1739,7 +1739,7 @@ instance ToJSON DateMathExpr where
1739type AggregationResults = M.Map Text Value
1739type AggregationResults = M.Map Text Value
1741class BucketAggregation a where
1741class BucketAggregation a where
1742− key :: a -> Text
1742+ key :: a -> BucketValue
1743 docCount :: a -> Int
1743 docCount :: a -> Int
1744 aggs :: a -> Maybe AggregationResults
1744 aggs :: a -> Maybe AggregationResults
@@ -1776,19 +1776,17 @@ toDateHistogram t a = M.lookup t a >>= deserialize
1776 where deserialize = parseMaybe parseJSON
1776 where deserialize = parseMaybe parseJSON
1778instance BucketAggregation TermsResult where
1778instance BucketAggregation TermsResult where
1779− key (TermsResult (TextValue t) _ _) = t
1779+ key = termKey
1780− key (TermsResult (ScientificValue s) _ _) = T.pack $ show s
1781− key (TermsResult (BoolValue b) _ _) = T.pack $ show b
1782 docCount = termsDocCount
1780 docCount = termsDocCount
1783 aggs = termsAggs
1781 aggs = termsAggs
1785instance BucketAggregation DateHistogramResult where
1783instance BucketAggregation DateHistogramResult where
1786− key = showText . dateKey
1784+ key = TextValue . showText . dateKey
1787 docCount = dateDocCount
1785 docCount = dateDocCount
1788 aggs = dateHistogramAggs
1786 aggs = dateHistogramAggs
1790instance BucketAggregation DateRangeResult where
1788instance BucketAggregation DateRangeResult where
1791− key = dateRangeKey
1789+ key = TextValue . dateRangeKey
1792 docCount = dateRangeDocCount
1790 docCount = dateRangeDocCount
1793 aggs = dateRangeAggs
1791 aggs = dateRangeAggs