searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-11 07:28:56 +01:00
Code Issues Releases Wiki Activity

fix missing primary key

Browse Source
This commit is contained in:
mpostma 2020-07-06 09:56:10 +02:00
parent ac63f1cd7a
commit 99e8d4adae
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meilisearch-core/src/error.rs
View File

@ -41,7 +41,7 @@ impl ErrorCode for Error {
FacetError(_) => Code::Facet, FacetError(_) => Code::Facet,
FilterParseError(_) => Code::Filter, FilterParseError(_) => Code::Filter,
IndexAlreadyExists => Code::IndexAlreadyExists, IndexAlreadyExists => Code::IndexAlreadyExists,
MissingPrimaryKey => Code::InvalidState, MissingPrimaryKey => Code::MissingPrimaryKey,
MissingDocumentId => Code::MissingDocumentId, MissingDocumentId => Code::MissingDocumentId,
MaxFieldsLimitExceeded => Code::MaxFieldsLimitExceeded, MaxFieldsLimitExceeded => Code::MaxFieldsLimitExceeded,
Schema(s) => s.error_code(), Schema(s) => s.error_code(),

2
meilisearch-error/src/lib.rs
View File

@ -97,7 +97,7 @@ impl Code {
// invalid state error // invalid state error
InvalidState => ErrCode::internal("invalid_state", StatusCode::INTERNAL_SERVER_ERROR), InvalidState => ErrCode::internal("invalid_state", StatusCode::INTERNAL_SERVER_ERROR),
// thrown when no primary key has been set // thrown when no primary key has been set
MissingPrimaryKey => ErrCode::internal("missing_primary_key", StatusCode::INTERNAL_SERVER_ERROR), MissingPrimaryKey => ErrCode::invalid("missing_primary_key", StatusCode::BAD_REQUEST),
// error thrown when trying to set an already existing primary key // error thrown when trying to set an already existing primary key
PrimaryKeyAlreadyPresent => ErrCode::invalid("primary_key_already_present", StatusCode::BAD_REQUEST), PrimaryKeyAlreadyPresent => ErrCode::invalid("primary_key_already_present", StatusCode::BAD_REQUEST),

4
meilisearch-http/src/routes/document.rs
View File

@ -156,7 +156,7 @@ async fn update_multiple_documents(
let mut schema = index let mut schema = index
.main .main
.schema(&reader)? .schema(&reader)?
.ok_or(Error::internal("Impossible to retrieve the schema"))?; .ok_or(meilisearch_core::Error::SchemaMissing)?;
if schema.primary_key().is_none() { if schema.primary_key().is_none() {
let id = match &params.primary_key { let id = match &params.primary_key {
@ -164,7 +164,7 @@ async fn update_multiple_documents(
None => body None => body
.first() .first()
.and_then(find_primary_key) .and_then(find_primary_key)
.ok_or(Error::bad_request("Could not infer a primary key"))?, .ok_or(meilisearch_core::Error::MissingPrimaryKey)?
}; };
schema schema

16
meilisearch-http/tests/errors.rs
View File

@ -92,7 +92,7 @@ async fn max_field_limit_exceeded_error() {
} }
let docs = json!([doc]); let docs = json!([doc]);
assert_error_async!( assert_error_async!(
"max_field_limit_exceeded", "max_fields_limit_exceeded",
"invalid_request_error", "invalid_request_error",
server, server,
server.add_or_replace_multiple_documents_sync(docs).await); server.add_or_replace_multiple_documents_sync(docs).await);
@ -180,3 +180,17 @@ async fn payload_too_large_error() {
StatusCode::PAYLOAD_TOO_LARGE, StatusCode::PAYLOAD_TOO_LARGE,
server.create_index(json!(bigvec)).await); server.create_index(json!(bigvec)).await);
} }
#[actix_rt::test]
async fn missing_primary_key_error() {
let mut server = common::Server::with_uid("test");
server.create_index(json!({"uid": "test"})).await;
let document = json!([{
"content": "test"
}]);
assert_error!(
"missing_primary_key",
"invalid_request_error",
StatusCode::BAD_REQUEST,
server.add_or_replace_multiple_documents_sync(document).await);
}

3
meilisearch-http/tests/index.rs
View File

@ -658,9 +658,8 @@ async fn check_add_documents_without_primary_key() {
let (response, status_code) = server.add_or_replace_multiple_documents_sync(body).await; let (response, status_code) = server.add_or_replace_multiple_documents_sync(body).await;
let message = response["message"].as_str().unwrap();
assert_eq!(response.as_object().unwrap().len(), 4); assert_eq!(response.as_object().unwrap().len(), 4);
assert_eq!(message, "Could not infer a primary key"); assert_eq!(response["errorCode"], "missing_primary_key");
assert_eq!(status_code, 400); assert_eq!(status_code, 400);
} }