mirror of
https://github.com/typeable/bloodhound.git
synced 2024-10-26 08:33:00 +03:00
merge upstream
This commit is contained in:
commit
94e3670650
10
Makefile
10
Makefile
@ -25,6 +25,16 @@ test: echo-warn
|
||||
7.10-test-ES5:
|
||||
STACK_YAML="stack-7.10.yaml" stack test bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:ES5
|
||||
|
||||
8.0-build:
|
||||
STACK_YAML="stack-8.0.yaml" stack build
|
||||
|
||||
8.2-build:
|
||||
STACK_YAML="stack-8.2.yaml" stack build
|
||||
|
||||
module-touch:
|
||||
touch src/Database/V1/Bloodhound/Types.hs
|
||||
touch src/Database/V5/Bloodhound/Types.hs
|
||||
|
||||
ghci:
|
||||
stack ghci
|
||||
|
||||
|
@ -922,7 +922,7 @@ defaultCache = False
|
||||
|
||||
{-| 'PrefixValue' is used in 'PrefixQuery' as the main query component.
|
||||
-}
|
||||
type PrefixValue = Text
|
||||
-- type PrefixValue = Text
|
||||
|
||||
{-| 'BooleanOperator' is the usual And/Or operators with an ES compatible
|
||||
JSON encoding baked in. Used all over the place.
|
||||
@ -2338,7 +2338,7 @@ instance FromJSON Query where
|
||||
queryRangeQuery = pure . QueryRangeQuery
|
||||
queryRegexpQuery = pure . QueryRegexpQuery
|
||||
querySimpleQueryStringQuery = pure . QuerySimpleQueryStringQuery
|
||||
queryExistsQuery o = QueryExistsQuery <$> o .: "field"
|
||||
-- queryExistsQuery o = QueryExistsQuery <$> o .: "field"
|
||||
queryTemplateQueryInline = pure . QueryTemplateQueryInline
|
||||
|
||||
|
||||
@ -2807,10 +2807,10 @@ instance FromJSON BoostingQuery where
|
||||
<*> o .: "negative_boost"
|
||||
|
||||
instance ToJSON BoolQuery where
|
||||
toJSON (BoolQuery mustM filterM notM shouldM bqMin boost disableCoord) =
|
||||
toJSON (BoolQuery mustM filterM' notM shouldM bqMin boost disableCoord) =
|
||||
omitNulls base
|
||||
where base = [ "must" .= mustM
|
||||
, "filter" .= filterM
|
||||
, "filter" .= filterM'
|
||||
, "must_not" .= notM
|
||||
, "should" .= shouldM
|
||||
, "minimum_should_match" .= bqMin
|
||||
|
20
stack-8.0.yaml
Normal file
20
stack-8.0.yaml
Normal file
@ -0,0 +1,20 @@
|
||||
flags:
|
||||
bloodhound-examples:
|
||||
werror: true
|
||||
|
||||
packages:
|
||||
- '.'
|
||||
- './examples'
|
||||
# extra-deps:
|
||||
# - http-client-0.5.0
|
||||
# - aeson-1.2.0.0
|
||||
# - fail-4.9.0.0
|
||||
# - http-types-0.9
|
||||
# - attoparsec-0.13.0.1
|
||||
# - quickcheck-properties-0.1
|
||||
# - semigroups-0.18.3
|
||||
# - uri-bytestring-0.1.9
|
||||
# - temporary-resourcet-0.1.0.0
|
||||
# - transformers-compat-0.5.1.4
|
||||
|
||||
resolver: lts-8.14
|
44
stack-8.2.yaml
Normal file
44
stack-8.2.yaml
Normal file
@ -0,0 +1,44 @@
|
||||
compiler: ghc-8.2.0.20170507
|
||||
compiler-check: match-exact
|
||||
resolver: lts-8.13
|
||||
setup-info:
|
||||
ghc:
|
||||
linux64:
|
||||
8.2.0.20170507:
|
||||
url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-deb8-linux.tar.xz
|
||||
content-length: 141011788
|
||||
sha1: ff886437c1d2ddfa5686d6c9efb0819a957c3dde
|
||||
macosx:
|
||||
8.2.0.20170507:
|
||||
url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-apple-darwin.tar.xz
|
||||
content-length: 126192308
|
||||
sha1: f059fe6f8a898d5619ab03e06e0ff0912a5f3340
|
||||
windows64:
|
||||
8.2.0.20170507:
|
||||
url: https://downloads.haskell.org/~ghc/8.2.1-rc2/ghc-8.2.0.20170507-x86_64-unknown-mingw32.tar.xz
|
||||
content-length: 177295548
|
||||
sha1: 87646ca3a89278775ceb7be429faafac3cf738d8
|
||||
|
||||
ghc-options: { "*": -XTypeSynonymInstances }
|
||||
|
||||
flags:
|
||||
bloodhound-examples:
|
||||
werror: false
|
||||
|
||||
allow-newer: true
|
||||
|
||||
packages:
|
||||
- '.'
|
||||
- './examples'
|
||||
|
||||
extra-deps:
|
||||
- http-client-0.5.0
|
||||
- aeson-1.2.0.0
|
||||
- fail-4.9.0.0
|
||||
- http-types-0.9
|
||||
- attoparsec-0.13.0.1
|
||||
- quickcheck-properties-0.1
|
||||
- semigroups-0.18.3
|
||||
- uri-bytestring-0.1.9
|
||||
- temporary-resourcet-0.1.0.0
|
||||
- transformers-compat-0.5.1.4
|
Loading…
Reference in New Issue
Block a user