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

Enable fetching fields and values from within complex Record IDs

Browse source 
Closes #1375
This commit is contained in:
Tobie Morgan Hitchcock 2022-10-19 11:03:13 +01:00
parent ad6ee5b42d
commit 7f56fb9964
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/sql/ident.rs
View file

@ -48,6 +48,10 @@ impl Ident {
pub fn to_raw(&self) -> String { pub fn to_raw(&self) -> String {
self.0.to_string() self.0.to_string()
} }
/// Returns a yield if an alias is specified
pub(crate) fn is_id(&self) -> bool {
self.0.as_str() == "id"
}
} }
impl Display for Ident { impl Display for Ident {

15
lib/src/sql/value/get.rs
View file

@ -4,10 +4,12 @@ use crate::dbs::Transaction;
use crate::err::Error; use crate::err::Error;
use crate::sql::edges::Edges; use crate::sql::edges::Edges;
use crate::sql::field::{Field, Fields}; use crate::sql::field::{Field, Fields};
use crate::sql::id::Id;
use crate::sql::part::Next; use crate::sql::part::Next;
use crate::sql::part::Part; use crate::sql::part::Part;
use crate::sql::paths::ID; use crate::sql::paths::ID;
use crate::sql::statements::select::SelectStatement; use crate::sql::statements::select::SelectStatement;
use crate::sql::thing::Thing;
use crate::sql::value::{Value, Values}; use crate::sql::value::{Value, Values};
use async_recursion::async_recursion; use async_recursion::async_recursion;
use futures::future::try_join_all; use futures::future::try_join_all;
@ -27,6 +29,19 @@ impl Value {
Some(p) => match self { Some(p) => match self {
// Current path part is an object // Current path part is an object
Value::Object(v) => match p { Value::Object(v) => match p {
// If requesting an `id` field, check if it is a complex Record ID
Part::Field(f) if f.is_id() && path.len() > 1 => match v.get(f as &str) {
Some(Value::Thing(Thing {
id: Id::Object(v),
..
})) => Value::Object(v.clone()).get(ctx, opt, txn, path.next()).await,
Some(Value::Thing(Thing {
id: Id::Array(v),
..
})) => Value::Array(v.clone()).get(ctx, opt, txn, path.next()).await,
Some(v) => v.get(ctx, opt, txn, path.next()).await,
None => Ok(Value::None),
},
Part::Graph(_) => match v.rid() { Part::Graph(_) => match v.rid() {
Some(v) => Value::Thing(v).get(ctx, opt, txn, path).await, Some(v) => Value::Thing(v).get(ctx, opt, txn, path).await,
None => Ok(Value::None), None => Ok(Value::None),