From 23d1c868259c3a7224e0df00e1469eb76a707851 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Mon, 15 May 2023 11:07:23 +0200 Subject: [PATCH 1/2] Re-introduce the sort error message fix --- meilisearch/tests/search/errors.rs | 2 +- milli/src/error.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meilisearch/tests/search/errors.rs b/meilisearch/tests/search/errors.rs index a9a2969bb..d402860be 100644 --- a/meilisearch/tests/search/errors.rs +++ b/meilisearch/tests/search/errors.rs @@ -946,7 +946,7 @@ async fn sort_unset_ranking_rule() { index.wait_task(1).await; let expected_response = json!({ - "message": "The sort ranking rule must be specified in the ranking rules settings to use the sort parameter at search time.", + "message": "You must specify where \"sort\" is listed in the rankingRules setting to use the sort parameter at search time", "code": "invalid_search_sort", "type": "invalid_request", "link": "https://docs.meilisearch.com/errors#invalid_search_sort" diff --git a/milli/src/error.rs b/milli/src/error.rs index 7f0faf2fd..6d3f402e2 100644 --- a/milli/src/error.rs +++ b/milli/src/error.rs @@ -126,7 +126,7 @@ only composed of alphanumeric characters (a-z A-Z 0-9), hyphens (-) and undersco InvalidSortableAttribute { field: String, valid_fields: BTreeSet }, #[error("{}", HeedError::BadOpenOptions)] InvalidLmdbOpenOptions, - #[error("The sort ranking rule must be specified in the ranking rules settings to use the sort parameter at search time.")] + #[error("You must specify where \"sort\" is listed in the rankingRules setting to use the sort parameter at search time")] SortRankingRuleMissing, #[error("The database file is in an invalid state.")] InvalidStoreFile, From 4d691d071a700f5391364b16b286049973e3c494 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Mon, 15 May 2023 11:10:36 +0200 Subject: [PATCH 2/2] Change double-quotes by back-ticks in sort error message --- meilisearch/tests/search/errors.rs | 2 +- milli/src/error.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meilisearch/tests/search/errors.rs b/meilisearch/tests/search/errors.rs index d402860be..528043908 100644 --- a/meilisearch/tests/search/errors.rs +++ b/meilisearch/tests/search/errors.rs @@ -946,7 +946,7 @@ async fn sort_unset_ranking_rule() { index.wait_task(1).await; let expected_response = json!({ - "message": "You must specify where \"sort\" is listed in the rankingRules setting to use the sort parameter at search time", + "message": "You must specify where `sort` is listed in the rankingRules setting to use the sort parameter at search time", "code": "invalid_search_sort", "type": "invalid_request", "link": "https://docs.meilisearch.com/errors#invalid_search_sort" diff --git a/milli/src/error.rs b/milli/src/error.rs index 6d3f402e2..fb87ced80 100644 --- a/milli/src/error.rs +++ b/milli/src/error.rs @@ -126,7 +126,7 @@ only composed of alphanumeric characters (a-z A-Z 0-9), hyphens (-) and undersco InvalidSortableAttribute { field: String, valid_fields: BTreeSet }, #[error("{}", HeedError::BadOpenOptions)] InvalidLmdbOpenOptions, - #[error("You must specify where \"sort\" is listed in the rankingRules setting to use the sort parameter at search time")] + #[error("You must specify where `sort` is listed in the rankingRules setting to use the sort parameter at search time")] SortRankingRuleMissing, #[error("The database file is in an invalid state.")] InvalidStoreFile,