postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-22 06:40:30 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Validate query_by id.

Browse Source
This commit is contained in:
Kishore Nallan 2022-10-07 12:51:29 +05:30
parent af28e9d239
commit cf908fb357
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/collection.cpp
View File

@ -935,6 +935,12 @@ Option<nlohmann::json> Collection::search(const std::string & raw_query,
std::vector<std::string> processed_search_fields;
for(const std::string& field_name: raw_search_fields) {
if(field_name == "id") {
// `id` field needs to be handled separately, we will not handle for now
std::string error = "Cannot use `id` as a query by field.";
return Option<nlohmann::json>(400, error);
}
auto field_op = extract_field_name(field_name, search_schema, processed_search_fields, true, enable_nested_fields);
if(!field_op.ok()) {
return Option<nlohmann::json>(field_op.code(), field_op.error());
@ -965,10 +971,10 @@ Option<nlohmann::json> Collection::search(const std::string & raw_query,
}
}
for(const std::string & field_name: group_by_fields) {
if(search_schema.count(field_name) == 0) {
std::string error = "Could not find a field named `" + field_name + "` in the schema.";
return Option<nlohmann::json>(404, error);
for(const std::string& field_name: group_by_fields) {
if(field_name == "id") {
std::string error = "Cannot use `id` as a group by field.";
return Option<nlohmann::json>(400, error);
}
field search_field = search_schema.at(field_name);

20
test/collection_specific_more_test.cpp
View File

@ -1457,4 +1457,24 @@ TEST_F(CollectionSpecificMoreTest, MustExcludeOutOf) {
auto res = res_op.get();
ASSERT_EQ(1, res["hits"].size());
ASSERT_EQ(0, res.count("out_of"));
}
TEST_F(CollectionSpecificMoreTest, ValidateQueryById) {
nlohmann::json schema = R"({
"name": "coll1",
"fields": [
{"name": "title", "type": "string"}
]
})"_json;
Collection* coll1 = collectionManager.create_collection(schema).get();
nlohmann::json doc;
doc["id"] = "doc-1";
doc["title"] = "Sample Title 1";
ASSERT_TRUE(coll1->add(doc.dump()).ok());
auto res_op = coll1->search("doc-1", {"id"}, "", {}, {}, {2}, 10, 1, FREQUENCY, {true}, 0);
ASSERT_FALSE(res_op.ok());
ASSERT_EQ("Cannot use `id` as a query by field.", res_op.error());
}