ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-22 07:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Interpret generate_series arguments as possibly NULL"

Browse Source 
This reverts commit 3a2312e0bd.
This commit is contained in:
David Selassie 2023-07-08 09:30:23 -07:00
parent 3c5a9be349
commit 379c6c8dcf
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/vtab/series.rs
View File

@ -8,6 +8,7 @@ use std::marker::PhantomData;
use std::os::raw::c_int; use std::os::raw::c_int;
use crate::ffi; use crate::ffi;
use crate::types::Type;
use crate::vtab::{ use crate::vtab::{
eponymous_only_module, Context, IndexConstraintOp, IndexInfo, VTab, VTabConfig, VTabConnection, eponymous_only_module, Context, IndexConstraintOp, IndexInfo, VTab, VTabConfig, VTabConnection,
VTabCursor, Values, VTabCursor, Values,
@ -197,34 +198,21 @@ impl SeriesTabCursor<'_> {
unsafe impl VTabCursor for SeriesTabCursor<'_> { unsafe impl VTabCursor for SeriesTabCursor<'_> {
fn filter(&mut self, idx_num: c_int, _idx_str: Option<&str>, args: &Values<'_>) -> Result<()> { fn filter(&mut self, idx_num: c_int, _idx_str: Option<&str>, args: &Values<'_>) -> Result<()> {
let mut idx_num = QueryPlanFlags::from_bits_truncate(idx_num); let mut idx_num = QueryPlanFlags::from_bits_truncate(idx_num);
let mut any_null = false;
let mut i = 0; let mut i = 0;
if idx_num.contains(QueryPlanFlags::START) { if idx_num.contains(QueryPlanFlags::START) {
if let Some(min_value) = args.get(i)? { self.min_value = args.get(i)?;
self.min_value = min_value;
} else {
any_null = true;
}
i += 1; i += 1;
} else { } else {
self.min_value = 0; self.min_value = 0;
} }
if idx_num.contains(QueryPlanFlags::STOP) { if idx_num.contains(QueryPlanFlags::STOP) {
if let Some(max_value) = args.get(i)? { self.max_value = args.get(i)?;
self.max_value = max_value;
} else {
any_null = true;
}
i += 1; i += 1;
} else { } else {
self.max_value = 0xffff_ffff; self.max_value = 0xffff_ffff;
} }
if idx_num.contains(QueryPlanFlags::STEP) { if idx_num.contains(QueryPlanFlags::STEP) {
if let Some(step) = args.get(i)? { self.step = args.get(i)?;
self.step = step;
} else {
any_null = true;
}
if self.step == 0 { if self.step == 0 {
self.step = 1; self.step = 1;
} else if self.step < 0 { } else if self.step < 0 {
@ -236,11 +224,13 @@ unsafe impl VTabCursor for SeriesTabCursor<'_> {
} else { } else {
self.step = 1; self.step = 1;
}; };
if any_null { for arg in args.iter() {
// If any of the constraints have a NULL value, then if arg.data_type() == Type::Null {
// return no rows. // If any of the constraints have a NULL value, then return no rows.
self.min_value = 1; self.min_value = 1;
self.max_value = 0; self.max_value = 0;
break;
}
} }
self.is_desc = idx_num.contains(QueryPlanFlags::DESC); self.is_desc = idx_num.contains(QueryPlanFlags::DESC);
if self.is_desc { if self.is_desc {