Commit Graph

399 Commits

Author SHA1 Message Date
John Galt
5bd802b637 Added parent support to documentExists 2015-09-15 18:46:56 -04:00
Chris Allen
7b0c8012e1 Merge branch 'master' of github.com:bitemyapp/bloodhound 2015-09-14 00:50:56 -05:00
Chris Allen
f28180c17f changes 2015-09-14 00:47:29 -05:00
Chris Allen
b169376f6b Merge pull request #71 from sjakobi/manager
Use "newManager" instead of deprecated "withManager"
2015-09-14 00:39:23 -05:00
Chris Allen
0e4c93f9a9 Merge pull request #70 from sjakobi/redundant-import
Silence redundant import warning with base-4.8.*
2015-09-14 00:38:51 -05:00
Chris Allen
64f9b2fd30 Merge pull request #69 from sjakobi/except
Replace Control.Monad.Error with CM.Except via mtl-compat
2015-09-14 00:38:05 -05:00
Chris Allen
d9061cdb7b merged 2015-09-14 00:36:52 -05:00
Chris Allen
50f5bfb7c5 release impending 2015-09-14 00:36:36 -05:00
Simon Jakobi
95e124ec7c Use "newManager" instead of deprecated "withManager"
"withManager" is deprecated since http-client-0.4.18.
2015-09-14 06:05:20 +02:00
Simon Jakobi
1eb87e58f0 Silence redundant import warning with base-4.8.* 2015-09-14 05:39:15 +02:00
Simon Jakobi
e68721c834 Replace Control.Monad.Error with CM.Except via mtl-compat
Control.Monad.Error is deprecated since mtl-2.2.1.
mtl-compat is a module that backports the Control.Monad.Except module
providing backwards compatibilty for users of mtl <= 2.2.0.
2015-09-14 05:30:00 +02:00
Chris Allen
09074d773f Merge pull request #67 from bitemyapp/65-monadmask
Take a stab at deriving Monad(Throw|Catch|Mask)
2015-09-10 11:42:29 -05:00
Michael Xavier
7e0bc41595 Take a stab at deriving Monad(Throw|Catch|Mask) 2015-09-05 13:39:18 -07:00
Chris Allen
d87027d4c5 Merge pull request #40 from silkapp/boost-in-match-query
Add support for boosting fields in match query
2015-08-31 11:03:50 -05:00
Thomas van Noort
984ca41e77 Merge remote-tracking branch 'upstream/master' into boost-in-match-query
Conflicts:
	src/Database/Bloodhound/Client.hs
2015-08-31 10:15:13 +02:00
Chris Allen
68ff8c21ab Merge pull request #39 from silkapp/source-in-search
Add support for source filtering in search
2015-08-28 10:30:17 -05:00
Thomas van Noort
e51b515427 Merge remote-tracking branch 'upstream/master' into boost-in-match-query
Conflicts:
	src/Database/Bloodhound/Client.hs
2015-08-28 11:46:35 +02:00
Thomas van Noort
dfa897d341 Merge remote-tracking branch 'upstream/master' into source-in-search
Conflicts:
	src/Database/Bloodhound/Client.hs
2015-08-28 11:45:33 +02:00
Chris Allen
40204d2e38 Merge pull request #64 from Soostone/export-bh
export BH constructor
2015-08-26 11:15:22 -05:00
Michael Xavier
e02e6e2588 export BH constructor 2015-08-26 08:38:26 -07:00
Chris Allen
2034616f2d Merge pull request #63 from bermanjosh/scanType
url query encoding bug
2015-08-23 12:16:33 -05:00
Chris Allen
ffa7218a3c different GHC versions 2015-08-23 11:56:06 -05:00
Chris Allen
89dae7d540 stack setup 2015-08-23 11:48:57 -05:00
Chris Allen
ff2a8923a0 fuck it, use Stack 2015-08-23 11:45:14 -05:00
Chris Allen
165c7283c7 nuke Cabal 2015-08-23 11:38:58 -05:00
Chris Allen
720c83ff5d nuke 2015-08-23 11:32:52 -05:00
Chris Allen
abfdf08c2d bump versions 2015-08-23 11:28:43 -05:00
Josh Berman
fa9cff1ce8 limit change scanSearch to given index and mapping to better match existing search functionality; add tests 2015-08-23 16:05:35 +03:00
Josh Berman
a4a15751a9 url query encoding bug 2015-08-18 16:26:51 +03:00
Thomas van Noort
2d6b668c34 Merge remote-tracking branch 'upstream/master' into boost-in-match-query
Conflicts:
	src/Database/Bloodhound/Client.hs
2015-08-18 11:21:18 +02:00
Thomas van Noort
11b77c94e7 Merge remote-tracking branch 'upstream/master' into source-in-search
Conflicts:
	src/Database/Bloodhound/Client.hs
	src/Database/Bloodhound/Types.hs
	tests/tests.hs
2015-08-18 11:15:55 +02:00
Chris Allen
9e0179b9a4 Merge pull request #53 from bermanjosh/scanType
Scan type
2015-08-17 23:57:24 -05:00
Josh Berman
c02b6c7174 doctest update, take 2 2015-08-17 22:49:23 +03:00
Josh Berman
6c505d235c doctest update 2015-08-17 22:40:26 +03:00
Josh Berman
e89cb58269 update tests for types 2015-08-17 20:24:42 +03:00
Josh Berman
53c397e928 Merge remote-tracking branch 'upstream/master' into scanType
Conflicts:
	bloodhound.cabal
	src/Database/Bloodhound/Client.hs
	src/Database/Bloodhound/Types.hs

merge
2015-08-17 17:17:36 +03:00
Thomas van Noort
d0d65a710e Fix doctests for boost in match query. 2015-08-12 14:18:53 +02:00
Thomas van Noort
cc9b285c22 Merge remote-tracking branch 'upstream/master' into boost-in-match-query 2015-08-12 13:40:37 +02:00
Thomas van Noort
f615ac26c2 Merge remote-tracking branch 'upstream/master' into source-in-search
Conflicts:
	src/Database/Bloodhound/Client.hs
	src/Database/Bloodhound/Types.hs
	tests/tests.hs
2015-08-12 11:46:12 +02:00
Chris Allen
f185e9d1e2 Merge pull request #59 from centromere/index-settings-fix
Fixed bug with IndexSettings serialization
2015-07-29 13:01:32 -05:00
John Galt
5f29058554 Set shards/replicas to 1/0 for doctesting 2015-07-29 13:12:57 -04:00
John Galt
60f1c70f4f Set shards/replicas to 1/0 for testing 2015-07-29 12:20:24 -04:00
Chris Allen
e88613fe93 Merge pull request #61 from Soostone/filter-aggregation
Add filter aggregation support
2015-07-29 10:52:04 -05:00
Chris Allen
45a08347a2 Merge pull request #60 from Soostone/value-count-aggregation
Add value_count aggregation support
2015-07-29 10:50:02 -05:00
John Galt
de835bce3a Fixed bug with IndexSettings serialization 2015-07-28 18:34:15 -04:00
Michael Xavier
b23bd7a2ea Add support for filter aggregations 2015-07-28 15:29:13 -07:00
Michael Xavier
463fdc8027 Add value_count aggregation support
This also adds a newtype for script. I would recommend the "Either Text
Text" for TermsAggregation be instead Either FieldName Script, but that
isn't directly related to this PR.
2015-07-28 09:17:25 -07:00
Chris Allen
85bbc620f4 Merge pull request #58 from Soostone/57-esresult-partiality
Eliminate partiality in EsResult
2015-07-27 21:16:47 -05:00
Michael Xavier
d9e8da1fc9 Add test case for missing document parse 2015-07-27 15:15:04 -07:00
Michael Xavier
92b520154e Eliminate partiality in EsResult
This will affect #57
2015-07-27 14:06:13 -07:00