mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-26 14:54:27 +01:00
Make it work with the dumps
This commit is contained in:
parent
0b08413c98
commit
29961b8c6b
@ -183,7 +183,7 @@ impl CompatV5ToV6 {
|
|||||||
.map(|index| match index {
|
.map(|index| match index {
|
||||||
v5::StarOr::Star => v6::StarOr::Star,
|
v5::StarOr::Star => v6::StarOr::Star,
|
||||||
v5::StarOr::Other(uid) => {
|
v5::StarOr::Other(uid) => {
|
||||||
v6::StarOr::Other(v6::IndexUid::new_unchecked(uid.as_str()))
|
v6::StarOr::Other(v6::IndexUidPattern::new_unchecked(uid.as_str()))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect(),
|
.collect(),
|
||||||
|
@ -35,7 +35,7 @@ pub type PaginationSettings = meilisearch_types::settings::PaginationSettings;
|
|||||||
// everything related to the api keys
|
// everything related to the api keys
|
||||||
pub type Action = meilisearch_types::keys::Action;
|
pub type Action = meilisearch_types::keys::Action;
|
||||||
pub type StarOr<T> = meilisearch_types::star_or::StarOr<T>;
|
pub type StarOr<T> = meilisearch_types::star_or::StarOr<T>;
|
||||||
pub type IndexUid = meilisearch_types::index_uid::IndexUid;
|
pub type IndexUidPattern = meilisearch_types::index_uid_pattern::IndexUidPattern;
|
||||||
|
|
||||||
// everything related to the errors
|
// everything related to the errors
|
||||||
pub type ResponseError = meilisearch_types::error::ResponseError;
|
pub type ResponseError = meilisearch_types::error::ResponseError;
|
||||||
|
@ -10,11 +10,16 @@ use crate::index_uid::{IndexUid, IndexUidFormatError};
|
|||||||
/// An index uid pattern is composed of only ascii alphanumeric characters, - and _, between 1 and 400
|
/// An index uid pattern is composed of only ascii alphanumeric characters, - and _, between 1 and 400
|
||||||
/// bytes long and optionally ending with a *.
|
/// bytes long and optionally ending with a *.
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
|
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
|
||||||
|
#[cfg_attr(feature = "test-traits", derive(proptest_derive::Arbitrary))]
|
||||||
pub struct IndexUidPattern(
|
pub struct IndexUidPattern(
|
||||||
#[cfg_attr(feature = "test-traits", proptest(regex("[a-zA-Z0-9_-]{1,400}\\*?")))] String,
|
#[cfg_attr(feature = "test-traits", proptest(regex("[a-zA-Z0-9_-]{1,400}\\*?")))] String,
|
||||||
);
|
);
|
||||||
|
|
||||||
impl IndexUidPattern {
|
impl IndexUidPattern {
|
||||||
|
pub fn new_unchecked(s: impl AsRef<str>) -> Self {
|
||||||
|
Self(s.as_ref().to_string())
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns wether this index uid matches this index uid pattern.
|
/// Returns wether this index uid matches this index uid pattern.
|
||||||
pub fn matches(&self, uid: &IndexUid) -> bool {
|
pub fn matches(&self, uid: &IndexUid) -> bool {
|
||||||
self.matches_str(uid.as_str())
|
self.matches_str(uid.as_str())
|
||||||
|
Loading…
Reference in New Issue
Block a user