noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify permissions definition and types

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2022-04-04 22:37:16 +01:00
parent 664260ef0d
commit 876a1e581e
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/src/sql/permission.rs
View file

@ -94,7 +94,7 @@ fn specific(i: &str) -> IResult<&str, Permissions> {
.iter() .iter()
.find_map(|x| { .find_map(|x| {
x.iter().find_map(|y| match y { x.iter().find_map(|y| match y {
(Permission::Select, ref v) => Some(v.to_owned()), ('s', ref v) => Some(v.to_owned()),
_ => None, _ => None,
}) })
}) })
@ -103,7 +103,7 @@ fn specific(i: &str) -> IResult<&str, Permissions> {
.iter() .iter()
.find_map(|x| { .find_map(|x| {
x.iter().find_map(|y| match y { x.iter().find_map(|y| match y {
(Permission::Create, ref v) => Some(v.to_owned()), ('c', ref v) => Some(v.to_owned()),
_ => None, _ => None,
}) })
}) })
@ -112,7 +112,7 @@ fn specific(i: &str) -> IResult<&str, Permissions> {
.iter() .iter()
.find_map(|x| { .find_map(|x| {
x.iter().find_map(|y| match y { x.iter().find_map(|y| match y {
(Permission::Update, ref v) => Some(v.to_owned()), ('u', ref v) => Some(v.to_owned()),
_ => None, _ => None,
}) })
}) })
@ -121,7 +121,7 @@ fn specific(i: &str) -> IResult<&str, Permissions> {
.iter() .iter()
.find_map(|x| { .find_map(|x| {
x.iter().find_map(|y| match y { x.iter().find_map(|y| match y {
(Permission::Delete, ref v) => Some(v.to_owned()), ('d', ref v) => Some(v.to_owned()),
_ => None, _ => None,
}) })
}) })
@ -134,10 +134,6 @@ fn specific(i: &str) -> IResult<&str, Permissions> {
pub enum Permission { pub enum Permission {
None, None,
Full, Full,
Select,
Create,
Update,
Delete,
Specific(Value), Specific(Value),
} }
@ -153,21 +149,20 @@ impl fmt::Display for Permission {
Permission::None => write!(f, "NONE"), Permission::None => write!(f, "NONE"),
Permission::Full => write!(f, "FULL"), Permission::Full => write!(f, "FULL"),
Permission::Specific(ref v) => write!(f, "WHERE {}", v), Permission::Specific(ref v) => write!(f, "WHERE {}", v),
_ => write!(f, ""),
} }
} }
} }
fn permission(i: &str) -> IResult<&str, Vec<(Permission, Permission)>> { fn permission(i: &str) -> IResult<&str, Vec<(char, Permission)>> {
let (i, _) = tag_no_case("FOR")(i)?; let (i, _) = tag_no_case("FOR")(i)?;
let (i, _) = shouldbespace(i)?; let (i, _) = shouldbespace(i)?;
let (i, kind) = separated_list0( let (i, kind) = separated_list0(
commas, commas,
alt(( alt((
map(tag_no_case("SELECT"), |_| Permission::Select), map(tag_no_case("SELECT"), |_| 's'),
map(tag_no_case("CREATE"), |_| Permission::Create), map(tag_no_case("CREATE"), |_| 'c'),
map(tag_no_case("UPDATE"), |_| Permission::Update), map(tag_no_case("UPDATE"), |_| 'u'),
map(tag_no_case("DELETE"), |_| Permission::Delete), map(tag_no_case("DELETE"), |_| 'd'),
)), )),
)(i)?; )(i)?;
let (i, _) = shouldbespace(i)?; let (i, _) = shouldbespace(i)?;
@ -178,7 +173,7 @@ fn permission(i: &str) -> IResult<&str, Vec<(Permission, Permission)>> {
Permission::Specific(v) Permission::Specific(v)
}), }),
))(i)?; ))(i)?;
Ok((i, kind.iter().map(|k| (k.to_owned(), expr.clone())).collect())) Ok((i, kind.into_iter().map(|k| (k, expr.clone())).collect()))
} }
#[cfg(test)] #[cfg(test)]