diff --git a/README.md b/README.md index 59ccad1..c3addc7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ connection.execute(" INSERT INTO users (name, age) VALUES ('Bob', 69); ").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() { println!("{} = {}", column, value.unwrap()); } diff --git a/src/connection.rs b/src/connection.rs index 8fe3450..630b0f4 100644 --- a/src/connection.rs +++ b/src/connection.rs @@ -38,10 +38,9 @@ impl Connection { /// /// 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 - /// types, prepared statement are highly preferable; see `iterate` and - /// `prepare`. + /// types, prepared statement are highly preferable; see `prepare`. #[inline] - pub fn process, F>(&self, statement: T, callback: F) -> Result<()> + pub fn iterate, F>(&self, statement: T, callback: F) -> Result<()> where F: FnMut(&[(&str, Option<&str>)]) -> bool { unsafe { diff --git a/src/lib.rs b/src/lib.rs index b544a23..ab7718d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,7 +13,7 @@ //! INSERT INTO users (name, age) VALUES ('Bob', 69); //! ").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() { //! println!("{} = {}", column, value.unwrap()); //! } diff --git a/tests/lib.rs b/tests/lib.rs index bb7871b..c3df7d2 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -18,7 +18,7 @@ fn connection_error() { } #[test] -fn connection_process() { +fn connection_iterate() { macro_rules! pair( ($one:expr, $two:expr) => (($one, Some($two))); ); @@ -27,7 +27,7 @@ fn connection_process() { let mut done = false; let statement = "SELECT * FROM users"; - ok!(connection.process(statement, |pairs| { + ok!(connection.iterate(statement, |pairs| { assert_eq!(pairs.len(), 4); assert_eq!(pairs[0], pair!("id", "1")); assert_eq!(pairs[1], pair!("name", "Alice"));