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

Ensure LIMIT BY clause does not cause query to fail

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2022-07-09 19:44:15 +01:00
parent 29e500017d
commit 90dfa9f49f
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/src/dbs/channel.rs
View file

@ -78,7 +78,9 @@ impl Iterable {
// Loop until no more keys // Loop until no more keys
loop { loop {
// Check if the context is finished // Check if the context is finished
ctx.check()?; if ctx.is_done() {
break;
}
// Get the next 1000 key-value entries // Get the next 1000 key-value entries
let res = match nxt { let res = match nxt {
None => { None => {
@ -104,7 +106,9 @@ impl Iterable {
// Loop over results // Loop over results
for (i, (k, v)) in res.into_iter().enumerate() { for (i, (k, v)) in res.into_iter().enumerate() {
// Check the context // Check the context
ctx.check()?; if ctx.is_done() {
break;
}
// Ready the next // Ready the next
if n == i + 1 { if n == i + 1 {
nxt = Some(k.clone()); nxt = Some(k.clone());
@ -199,7 +203,9 @@ impl Iterable {
// Loop until no more keys // Loop until no more keys
loop { loop {
// Check if the context is finished // Check if the context is finished
ctx.check()?; if ctx.is_done() {
break;
}
// Get the next 1000 key-value entries // Get the next 1000 key-value entries
let res = match nxt { let res = match nxt {
None => { None => {
@ -225,7 +231,9 @@ impl Iterable {
// Loop over results // Loop over results
for (i, (k, _)) in res.into_iter().enumerate() { for (i, (k, _)) in res.into_iter().enumerate() {
// Check the context // Check the context
ctx.check()?; if ctx.is_done() {
break;
}
// Ready the next // Ready the next
if n == i + 1 { if n == i + 1 {
nxt = Some(k.clone()); nxt = Some(k.clone());

16
lib/src/dbs/iterate.rs
View file

@ -78,7 +78,9 @@ impl Iterable {
// Loop until no more keys // Loop until no more keys
loop { loop {
// Check if the context is finished // Check if the context is finished
ctx.check()?; if ctx.is_done() {
break;
}
// Get the next 1000 key-value entries // Get the next 1000 key-value entries
let res = match nxt { let res = match nxt {
None => { None => {
@ -104,7 +106,9 @@ impl Iterable {
// Loop over results // Loop over results
for (i, (k, v)) in res.into_iter().enumerate() { for (i, (k, v)) in res.into_iter().enumerate() {
// Check the context // Check the context
ctx.check()?; if ctx.is_done() {
break;
}
// Ready the next // Ready the next
if n == i + 1 { if n == i + 1 {
nxt = Some(k.clone()); nxt = Some(k.clone());
@ -199,7 +203,9 @@ impl Iterable {
// Loop until no more keys // Loop until no more keys
loop { loop {
// Check if the context is finished // Check if the context is finished
ctx.check()?; if ctx.is_done() {
break;
}
// Get the next 1000 key-value entries // Get the next 1000 key-value entries
let res = match nxt { let res = match nxt {
None => { None => {
@ -225,7 +231,9 @@ impl Iterable {
// Loop over results // Loop over results
for (i, (k, _)) in res.into_iter().enumerate() { for (i, (k, _)) in res.into_iter().enumerate() {
// Check the context // Check the context
ctx.check()?; if ctx.is_done() {
break;
}
// Ready the next // Ready the next
if n == i + 1 { if n == i + 1 {
nxt = Some(k.clone()); nxt = Some(k.clone());

4
lib/src/fnc/script/main.rs
View file

@ -12,7 +12,9 @@ pub async fn run(
doc: Option<&Value>, doc: Option<&Value>,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
// Check the context // Check the context
let _ = ctx.check()?; if ctx.is_done() {
return Ok(Value::None);
}
// Create a new agent // Create a new agent
let exe = Executor::default(); let exe = Executor::default();
// Create an JavaScript context // Create an JavaScript context