Merge pull request #134 from dcz-self/dev

Add into_iter for NamedRows
main
Ziyang Hu 1 year ago committed by GitHub
commit 332435a52c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -125,6 +125,27 @@ pub(crate) struct BadDbInit(#[help] pub(crate) String);
#[diagnostic(code(tx::import_into_index))] #[diagnostic(code(tx::import_into_index))]
pub(crate) struct ImportIntoIndex(pub(crate) String); pub(crate) struct ImportIntoIndex(pub(crate) String);
/// Iterates over all rows in sequence
pub struct RowsIter {
rows: NamedRows,
}
impl Iterator for RowsIter {
type Item = Tuple;
fn next(&mut self) -> Option<Self::Item> {
if self.rows.rows.is_empty() {
if let Some(rows) = self.rows.next.take() {
self.rows = *rows;
self.next()
} else {
None
}
} else {
Some(self.rows.rows.remove(0))
}
}
}
#[derive(serde_derive::Serialize, serde_derive::Deserialize, Debug, Clone, Default)] #[derive(serde_derive::Serialize, serde_derive::Deserialize, Debug, Clone, Default)]
/// Rows in a relation, together with headers for the fields. /// Rows in a relation, together with headers for the fields.
pub struct NamedRows { pub struct NamedRows {
@ -167,6 +188,11 @@ impl NamedRows {
collected collected
} }
/// Convert into an iterator over rows.
pub fn into_iter(self) -> RowsIter {
RowsIter { rows: self }
}
/// Convert to a JSON object /// Convert to a JSON object
pub fn into_json(self) -> JsonValue { pub fn into_json(self) -> JsonValue {
let nxt = match self.next { let nxt = match self.next {
@ -1935,3 +1961,46 @@ pub(crate) fn seconds_since_the_epoch() -> Result<f64> {
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
Ok(js_sys::Date::now()) Ok(js_sys::Date::now())
} }
#[cfg(test)]
mod test {
use super::*;
#[test]
fn empty() {
assert_eq!(
RowsIter {
rows: NamedRows::default()
}
.next(),
None,
);
}
#[test]
fn few() {
let mut rows = RowsIter {
rows: NamedRows {
rows: vec![Vec::new()],
..Default::default()
},
};
assert_eq!(rows.next(), Some(Vec::new()),);
assert_eq!(rows.next(), None,);
}
#[test]
fn many() {
let mut rows = RowsIter {
rows: NamedRows {
rows: vec![Vec::new()],
next: Some(Box::new(NamedRows {
rows: vec![Vec::new()],
..Default::default()
})),
..Default::default()
},
};
assert_eq!(rows.next(), Some(Vec::new()),);
assert_eq!(rows.next(), Some(Vec::new()),);
assert_eq!(rows.next(), None,);
}
}

Loading…
Cancel
Save