From 85d19bfb3eab19ff97fd24fbdd029852dfc7cff3 Mon Sep 17 00:00:00 2001
From: Tamo <tamo@meilisearch.com>
Date: Mon, 16 May 2022 17:16:53 +0200
Subject: [PATCH] chore: bump milli

---
 Cargo.lock                                        |  8 ++++----
 meilisearch-auth/Cargo.toml                       |  2 +-
 meilisearch-http/tests/documents/add_documents.rs | 13 ++-----------
 meilisearch-lib/Cargo.toml                        |  2 +-
 meilisearch-lib/src/index/index.rs                |  2 +-
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 173162bc8..13df934ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1093,7 +1093,7 @@ dependencies = [
 [[package]]
 name = "filter-parser"
 version = "0.26.4"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
 dependencies = [
  "nom",
  "nom_locate",
@@ -1120,7 +1120,7 @@ dependencies = [
 [[package]]
 name = "flatten-serde-json"
 version = "0.26.4"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
 dependencies = [
  "serde_json",
 ]
@@ -1623,7 +1623,7 @@ dependencies = [
 [[package]]
 name = "json-depth-checker"
 version = "0.26.4"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
 dependencies = [
  "serde_json",
 ]
@@ -2152,7 +2152,7 @@ dependencies = [
 [[package]]
 name = "milli"
 version = "0.26.4"
-source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.4#6ee67df128b63f40eedfe1cb2edfa1a59492e310"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.26.5#1f6dc31e2f8ee02cdda255a856d15f253daf17ec"
 dependencies = [
  "bimap",
  "bincode",
diff --git a/meilisearch-auth/Cargo.toml b/meilisearch-auth/Cargo.toml
index 193959b05..ca23921a9 100644
--- a/meilisearch-auth/Cargo.toml
+++ b/meilisearch-auth/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 enum-iterator = "0.7.0"
 meilisearch-error = { path = "../meilisearch-error" }
-milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.4" }
+milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.5" }
 rand = "0.8.4"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = { version = "1.0.79", features = ["preserve_order"] }
diff --git a/meilisearch-http/tests/documents/add_documents.rs b/meilisearch-http/tests/documents/add_documents.rs
index 652651e7f..911cfd312 100644
--- a/meilisearch-http/tests/documents/add_documents.rs
+++ b/meilisearch-http/tests/documents/add_documents.rs
@@ -991,7 +991,7 @@ async fn error_document_field_limit_reached() {
 }
 
 #[actix_rt::test]
-async fn error_add_documents_invalid_geo_field() {
+async fn add_documents_invalid_geo_field() {
     let server = Server::new().await;
     let index = server.index("test");
     index.create(Some("id")).await;
@@ -1010,16 +1010,7 @@ async fn error_add_documents_invalid_geo_field() {
     index.wait_task(2).await;
     let (response, code) = index.get_task(2).await;
     assert_eq!(code, 200);
-    assert_eq!(response["status"], "failed");
-
-    let expected_error = json!({
-        "message": r#"The document with the id: `11` contains an invalid `_geo` field."#,
-        "code": "invalid_geo_field",
-        "type": "invalid_request",
-        "link": "https://docs.meilisearch.com/errors#invalid_geo_field"
-    });
-
-    assert_eq!(response["error"], expected_error);
+    assert_eq!(response["status"], "succeeded");
 }
 
 #[actix_rt::test]
diff --git a/meilisearch-lib/Cargo.toml b/meilisearch-lib/Cargo.toml
index 41ef7169c..e2dab2a9c 100644
--- a/meilisearch-lib/Cargo.toml
+++ b/meilisearch-lib/Cargo.toml
@@ -30,7 +30,7 @@ lazy_static = "1.4.0"
 log = "0.4.14"
 meilisearch-auth = { path = "../meilisearch-auth" }
 meilisearch-error = { path = "../meilisearch-error" }
-milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.4" }
+milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.26.5" }
 mime = "0.3.16"
 num_cpus = "1.13.1"
 obkv = "0.2.0"
diff --git a/meilisearch-lib/src/index/index.rs b/meilisearch-lib/src/index/index.rs
index 03b4ca7dd..f5122c8c1 100644
--- a/meilisearch-lib/src/index/index.rs
+++ b/meilisearch-lib/src/index/index.rs
@@ -135,7 +135,7 @@ impl Index {
             .map(|fields| fields.into_iter().map(String::from).collect());
 
         let searchable_attributes = self
-            .searchable_fields(txn)?
+            .user_defined_searchable_fields(txn)?
             .map(|fields| fields.into_iter().map(String::from).collect());
 
         let filterable_attributes = self.filterable_fields(txn)?.into_iter().collect();