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

Bug fix: In some conditions iteration stages would avoid iterating (#3513)

Browse source
This commit is contained in:
Emmanuel Keller 2024-02-15 11:32:20 +00:00 committed by GitHub
parent 6782b8000a
commit 06a06338b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/dbs/iterator.rs
View file

@ -308,15 +308,12 @@ impl Iterator {
while let Some(s) = qp.next_iteration_stage().await {
let is_last = matches!(s, IterationStage::Iterate(_));
cancel_ctx.set_iteration_stage(s);
if is_last {
self.iterate(&cancel_ctx, opt, txn, stm).await?;
} else {
if !is_last {
self.clone().iterate(&cancel_ctx, opt, txn, stm).await?;
};
}
} else {
self.iterate(&cancel_ctx, opt, txn, stm).await?;
}
self.iterate(&cancel_ctx, opt, txn, stm).await?;
// Return any document errors
if let Some(e) = self.error.take() {
return Err(e);

33
lib/tests/select.rs
View file

@ -1074,3 +1074,36 @@ async fn select_only() -> Result<(), Error> {
//
Ok(())
}
#[tokio::test]
async fn select_issue_3510() -> Result<(), Error> {
let sql: &str = "
CREATE a:1;
CREATE b:1 SET link = a:1, num = 1;
SELECT link.* FROM b;
SELECT link.* FROM b WHERE num = 1;
";
let dbs = new_ds().await?;
let ses = Session::owner().with_ns("test").with_db("test");
let res = &mut dbs.execute(sql, &ses, None).await?;
assert_eq!(res.len(), 4);
//
let _ = res.remove(0).result?;
let _ = res.remove(0).result?;
//
let tmp = res.remove(0).result?;
let val = Value::parse(
"[
{
link: {
id: a:1
}
}
]",
);
assert_eq!(format!("{:#}", tmp), format!("{:#}", val));
//
let tmp = res.remove(0).result?;
assert_eq!(format!("{:#}", tmp), format!("{:#}", val));
Ok(())
}