git.iko.soy/typeable/bloodhound
on master help sign in
merge upstream
commit94e3670650c5abd2ea089c16a9c3ab06970c1789 authorJosh Berman <berman.josh@gmail.com> dateWed 17 May 2017, 08:49 (9 years ago) parenta3784fa0bf1cb7
4 files changed+78−4
compare with master
unifiedsplit
Makefile+10 src/Database/V5/Bloodhound/Types.hs+4−4 stack-8.0.yaml+20 stack-8.2.yaml+44
Makefile+10
@@ -25,6 +25,16 @@ test: echo-warn
25257.10-test-ES5:
2626 STACK_YAML="stack-7.10.yaml" stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5
2727
28+8.0-build:
29+ STACK_YAML="stack-8.0.yaml" stack build
30+
31+8.2-build:
32+ STACK_YAML="stack-8.2.yaml" stack build
33+
34+module-touch:
35+ touch src/Database/V1/Bloodhound/Types.hs
36+ touch src/Database/V5/Bloodhound/Types.hs
37+
2838ghci:
2939 stack ghci
3040
src/Database/V5/Bloodhound/Types.hs+4−4
@@ -922,7 +922,7 @@ defaultCache = False
922922
923923{-| 'PrefixValue' is used in 'PrefixQuery' as the main query component.
924924-}
925−type PrefixValue = Text
925+-- type PrefixValue = Text
926926
927927{-| 'BooleanOperator' is the usual And/Or operators with an ES compatible
928928 JSON encoding baked in. Used all over the place.
@@ -2338,7 +2338,7 @@ instance FromJSON Query where
23382338 queryRangeQuery = pure . QueryRangeQuery
23392339 queryRegexpQuery = pure . QueryRegexpQuery
23402340 querySimpleQueryStringQuery = pure . QuerySimpleQueryStringQuery
2341− queryExistsQuery o = QueryExistsQuery <$> o .: "field"
2341+ -- queryExistsQuery o = QueryExistsQuery <$> o .: "field"
23422342 queryTemplateQueryInline = pure . QueryTemplateQueryInline
23432343
23442344
@@ -2807,10 +2807,10 @@ instance FromJSON BoostingQuery where
28072807 <*> o .: "negative_boost"
28082808
28092809instance ToJSON BoolQuery where
2810− toJSON (BoolQuery mustM filterM notM shouldM bqMin boost disableCoord) =
2810+ toJSON (BoolQuery mustM filterM' notM shouldM bqMin boost disableCoord) =
28112811 omitNulls base
28122812 where base = [ "must" .= mustM
2813− , "filter" .= filterM
2813+ , "filter" .= filterM'
28142814 , "must_not" .= notM
28152815 , "should" .= shouldM
28162816 , "minimum_should_match" .= bqMin
stack-8.0.yamlnew file+20
@@ -0,0 +1,20 @@
1+flags:
2+ bloodhound-examples:
3+ werror: true
4+
5+packages:
6+- '.'
7+- './examples'
8+# extra-deps:
9+# - http-client-0.5.0
10+# - aeson-1.2.0.0
11+# - fail-4.9.0.0
12+# - http-types-0.9
13+# - attoparsec-0.13.0.1
14+# - quickcheck-properties-0.1
15+# - semigroups-0.18.3
16+# - uri-bytestring-0.1.9
17+# - temporary-resourcet-0.1.0.0
18+# - transformers-compat-0.5.1.4
19+
20+resolver: lts-8.14
stack-8.2.yamlnew file+44
@@ -0,0 +1,44 @@
1+compiler: ghc-8.2.0.20170507
2+compiler-check: match-exact
3+resolver: lts-8.13
4+setup-info:
5+ ghc:
6+ linux64:
7+ 8.2.0.20170507:
8+ url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-deb8-linux.tar.xz
9+ content-length: 141011788
10+ sha1: ff886437c1d2ddfa5686d6c9efb0819a957c3dde
11+ macosx:
12+ 8.2.0.20170507:
13+ url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-apple-darwin.tar.xz
14+ content-length: 126192308
15+ sha1: f059fe6f8a898d5619ab03e06e0ff0912a5f3340
16+ windows64:
17+ 8.2.0.20170507:
18+ url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-unknown-mingw32.tar.xz
19+ content-length: 177295548
20+ sha1: 87646ca3a89278775ceb7be429faafac3cf738d8
21+
22+ghc-options: { "*": -XTypeSynonymInstances }
23+
24+flags:
25+ bloodhound-examples:
26+ werror: false
27+
28+allow-newer: true
29+
30+packages:
31+- '.'
32+- './examples'
33+
34+extra-deps:
35+- http-client-0.5.0
36+- aeson-1.2.0.0
37+- fail-4.9.0.0
38+- http-types-0.9
39+- attoparsec-0.13.0.1
40+- quickcheck-properties-0.1
41+- semigroups-0.18.3
42+- uri-bytestring-0.1.9
43+- temporary-resourcet-0.1.0.0
44+- transformers-compat-0.5.1.4