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

Ensure nested fields are allowed in REMOVE FIELD statements

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2022-09-28 02:36:29 +01:00
parent 26c1cff9f1
commit 0bd0019def
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/src/sql/statements/remove.rs
View file

@ -7,6 +7,8 @@ use crate::sql::base::{base, base_or_scope, Base};
use crate::sql::comment::shouldbespace; use crate::sql::comment::shouldbespace;
use crate::sql::error::IResult; use crate::sql::error::IResult;
use crate::sql::ident::{ident, Ident}; use crate::sql::ident::{ident, Ident};
use crate::sql::idiom;
use crate::sql::idiom::Idiom;
use crate::sql::value::Value; use crate::sql::value::Value;
use derive::Store; use derive::Store;
use nom::branch::alt; use nom::branch::alt;
@ -544,7 +546,7 @@ fn event(i: &str) -> IResult<&str, RemoveEventStatement> {
#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, Store)] #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, Store)]
pub struct RemoveFieldStatement { pub struct RemoveFieldStatement {
pub name: Ident, pub name: Idiom,
pub what: Ident, pub what: Ident,
} }
@ -565,7 +567,7 @@ impl RemoveFieldStatement {
// Claim transaction // Claim transaction
let mut run = run.lock().await; let mut run = run.lock().await;
// Delete the definition // Delete the definition
let key = crate::key::fd::new(opt.ns(), opt.db(), &self.what, &self.name); let key = crate::key::fd::new(opt.ns(), opt.db(), &self.what, &self.name.to_string());
run.del(key).await?; run.del(key).await?;
// Ok all good // Ok all good
Ok(Value::None) Ok(Value::None)
@ -583,7 +585,7 @@ fn field(i: &str) -> IResult<&str, RemoveFieldStatement> {
let (i, _) = shouldbespace(i)?; let (i, _) = shouldbespace(i)?;
let (i, _) = tag_no_case("FIELD")(i)?; let (i, _) = tag_no_case("FIELD")(i)?;
let (i, _) = shouldbespace(i)?; let (i, _) = shouldbespace(i)?;
let (i, name) = ident(i)?; let (i, name) = idiom::local(i)?;
let (i, _) = shouldbespace(i)?; let (i, _) = shouldbespace(i)?;
let (i, _) = tag_no_case("ON")(i)?; let (i, _) = tag_no_case("ON")(i)?;
let (i, _) = opt(tuple((shouldbespace, tag_no_case("TABLE"))))(i)?; let (i, _) = opt(tuple((shouldbespace, tag_no_case("TABLE"))))(i)?;