From 26ab6ab0cc663d429cdc2610a0d3b64e44a55a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 10 Nov 2022 12:04:09 +0100 Subject: [PATCH 1/2] Bump milli version to 0.35.1 --- Cargo.lock | 16 ++++++++-------- meilisearch-types/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 01eb9cd36..aa9eeebde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1332,8 +1332,8 @@ dependencies = [ [[package]] name = "filter-parser" -version = "0.35.0" -source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36" +version = "0.35.1" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c" dependencies = [ "nom", "nom_locate", @@ -1351,8 +1351,8 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "0.35.0" -source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36" +version = "0.35.1" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c" dependencies = [ "serde_json", ] @@ -1897,8 +1897,8 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "0.35.0" -source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36" +version = "0.35.1" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c" dependencies = [ "serde_json", ] @@ -2416,8 +2416,8 @@ dependencies = [ [[package]] name = "milli" -version = "0.35.0" -source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36" +version = "0.35.1" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c" dependencies = [ "bimap", "bincode", diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 3b5346438..639298408 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -12,7 +12,7 @@ either = { version = "1.6.1", features = ["serde"] } enum-iterator = "1.1.3" flate2 = "1.0.24" fst = "0.4.7" -milli = { git = "https://github.com/meilisearch/milli.git", version = "0.35.0", default-features = false } +milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.35.1", default-features = false } proptest = { version = "1.0.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } roaring = { version = "0.10.0", features = ["serde"] } From 761bd3aca4b858d182c08728ff2a00f2aef0eb87 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Wed, 9 Nov 2022 14:23:37 +0100 Subject: [PATCH 2/2] Fix the new error messages --- meilisearch-http/tests/search/errors.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meilisearch-http/tests/search/errors.rs b/meilisearch-http/tests/search/errors.rs index 76e63eeb7..add305083 100644 --- a/meilisearch-http/tests/search/errors.rs +++ b/meilisearch-http/tests/search/errors.rs @@ -70,7 +70,7 @@ async fn filter_invalid_syntax_object() { index.wait_task(1).await; let expected_response = json!({ - "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass", + "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass", "code": "invalid_filter", "type": "invalid_request", "link": "https://docs.meilisearch.com/errors#invalid_filter" @@ -95,7 +95,7 @@ async fn filter_invalid_syntax_array() { index.wait_task(1).await; let expected_response = json!({ - "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass", + "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass", "code": "invalid_filter", "type": "invalid_request", "link": "https://docs.meilisearch.com/errors#invalid_filter"