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

Ensure RELATE statements parse correctly with parameters

Browse source 
Closes #1313
This commit is contained in:
Tobie Morgan Hitchcock 2022-10-17 03:13:10 +01:00
parent 0a4b810fbd
commit d2761c6bf6
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/sql/param.rs
View file

@ -86,6 +86,12 @@ pub fn param(i: &str) -> IResult<&str, Param> {
Ok((i, Param::from(v))) Ok((i, Param::from(v)))
} }
pub fn basic(i: &str) -> IResult<&str, Param> {
let (i, _) = char('$')(i)?;
let (i, v) = idiom::basic(i)?;
Ok((i, Param::from(v)))
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {

15
lib/src/sql/statements/relate.rs
View file

@ -12,7 +12,7 @@ use crate::sql::comment::shouldbespace;
use crate::sql::data::{data, Data}; use crate::sql::data::{data, Data};
use crate::sql::error::IResult; use crate::sql::error::IResult;
use crate::sql::output::{output, Output}; use crate::sql::output::{output, Output};
use crate::sql::param::param; use crate::sql::param::basic as param;
use crate::sql::subquery::subquery; use crate::sql::subquery::subquery;
use crate::sql::table::{table, Table}; use crate::sql::table::{table, Table};
use crate::sql::thing::thing; use crate::sql::thing::thing;
@ -271,7 +271,7 @@ mod tests {
#[test] #[test]
fn relate_statement_in() { fn relate_statement_in() {
let sql = "RELATE person:tobie->like->animal:koala"; let sql = "RELATE animal:koala<-like<-person:tobie";
let res = relate(sql); let res = relate(sql);
assert!(res.is_ok()); assert!(res.is_ok());
let out = res.unwrap().1; let out = res.unwrap().1;
@ -280,10 +280,19 @@ mod tests {
#[test] #[test]
fn relate_statement_out() { fn relate_statement_out() {
let sql = "RELATE animal:koala<-like<-person:tobie"; let sql = "RELATE person:tobie->like->animal:koala";
let res = relate(sql); let res = relate(sql);
assert!(res.is_ok()); assert!(res.is_ok());
let out = res.unwrap().1; let out = res.unwrap().1;
assert_eq!("RELATE person:tobie -> like -> animal:koala", format!("{}", out)) assert_eq!("RELATE person:tobie -> like -> animal:koala", format!("{}", out))
} }
#[test]
fn relate_statement_params() {
let sql = "RELATE $tobie->like->$koala";
let res = relate(sql);
assert!(res.is_ok());
let out = res.unwrap().1;
assert_eq!("RELATE $tobie -> like -> $koala", format!("{}", out))
}
} }