Rename process to iterate

This commit is contained in:
Ivan Ukhov 2015-08-03 17:12:15 -04:00
parent 5072b6e2f3
commit 2091c9843c
4 changed files with 6 additions and 7 deletions

View File

@ -17,7 +17,7 @@ connection.execute("
INSERT INTO users (name, age) VALUES ('Bob', 69); INSERT INTO users (name, age) VALUES ('Bob', 69);
").unwrap(); ").unwrap();
connection.process("SELECT * FROM users WHERE age > 50", |pairs| { connection.iterate("SELECT * FROM users WHERE age > 50", |pairs| {
for &(column, value) in pairs.iter() { for &(column, value) in pairs.iter() {
println!("{} = {}", column, value.unwrap()); println!("{} = {}", column, value.unwrap());
} }

View File

@ -38,10 +38,9 @@ impl Connection {
/// ///
/// The callback is triggered for each row. If the callback returns `false`, /// The callback is triggered for each row. If the callback returns `false`,
/// no more rows will be processed. For large queries and non-string data /// no more rows will be processed. For large queries and non-string data
/// types, prepared statement are highly preferable; see `iterate` and /// types, prepared statement are highly preferable; see `prepare`.
/// `prepare`.
#[inline] #[inline]
pub fn process<T: AsRef<str>, F>(&self, statement: T, callback: F) -> Result<()> pub fn iterate<T: AsRef<str>, F>(&self, statement: T, callback: F) -> Result<()>
where F: FnMut(&[(&str, Option<&str>)]) -> bool where F: FnMut(&[(&str, Option<&str>)]) -> bool
{ {
unsafe { unsafe {

View File

@ -13,7 +13,7 @@
//! INSERT INTO users (name, age) VALUES ('Bob', 69); //! INSERT INTO users (name, age) VALUES ('Bob', 69);
//! ").unwrap(); //! ").unwrap();
//! //!
//! connection.process("SELECT * FROM users WHERE age > 50", |pairs| { //! connection.iterate("SELECT * FROM users WHERE age > 50", |pairs| {
//! for &(column, value) in pairs.iter() { //! for &(column, value) in pairs.iter() {
//! println!("{} = {}", column, value.unwrap()); //! println!("{} = {}", column, value.unwrap());
//! } //! }

View File

@ -18,7 +18,7 @@ fn connection_error() {
} }
#[test] #[test]
fn connection_process() { fn connection_iterate() {
macro_rules! pair( macro_rules! pair(
($one:expr, $two:expr) => (($one, Some($two))); ($one:expr, $two:expr) => (($one, Some($two)));
); );
@ -27,7 +27,7 @@ fn connection_process() {
let mut done = false; let mut done = false;
let statement = "SELECT * FROM users"; let statement = "SELECT * FROM users";
ok!(connection.process(statement, |pairs| { ok!(connection.iterate(statement, |pairs| {
assert_eq!(pairs.len(), 4); assert_eq!(pairs.len(), 4);
assert_eq!(pairs[0], pair!("id", "1")); assert_eq!(pairs[0], pair!("id", "1"));
assert_eq!(pairs[1], pair!("name", "Alice")); assert_eq!(pairs[1], pair!("name", "Alice"));