From 1fdedd03f9c8c3cf6c80ac8844deaa3300069ae6 Mon Sep 17 00:00:00 2001
From: Ivan Ukhov <ivan.ukhov@gmail.com>
Date: Mon, 8 Jun 2015 15:00:44 -0400
Subject: [PATCH] Rename instruct to execute and iterate to process

---
 README.md            | 4 ++--
 examples/workflow.rs | 4 ++--
 src/database.rs      | 8 ++++----
 tests/lib.rs         | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 6f9e151..50c3791 100644
--- a/README.md
+++ b/README.md
@@ -22,12 +22,12 @@ fn main() {
     let path = setup();
     let database = sqlite::open(&path).unwrap();
 
-    database.instruct(r#"
+    database.execute(r#"
         CREATE TABLE `users` (id INTEGER, name VARCHAR(255));
         INSERT INTO `users` (id, name) VALUES (1, 'Alice');
     "#).unwrap();
 
-    database.iterate("SELECT * FROM `users`;", |pairs| {
+    database.process("SELECT * FROM `users`;", |pairs| {
         for (ref column, ref value) in pairs {
             println!("{} = {}", column, value);
         }
diff --git a/examples/workflow.rs b/examples/workflow.rs
index eeb28c0..d94c73f 100644
--- a/examples/workflow.rs
+++ b/examples/workflow.rs
@@ -7,12 +7,12 @@ fn main() {
     let path = setup();
     let database = sqlite::open(&path).unwrap();
 
-    database.instruct(r#"
+    database.execute(r#"
         CREATE TABLE `users` (id INTEGER, name VARCHAR(255));
         INSERT INTO `users` (id, name) VALUES (1, 'Alice');
     "#).unwrap();
 
-    database.iterate("SELECT * FROM `users`;", |pairs| {
+    database.process("SELECT * FROM `users`;", |pairs| {
         for (ref column, ref value) in pairs {
             println!("{} = {}", column, value);
         }
diff --git a/src/database.rs b/src/database.rs
index 6c28186..af1727a 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -28,7 +28,7 @@ impl<'l> Database<'l> {
 
     /// Execute a query without processing the resulting rows if any.
     #[inline]
-    pub fn instruct(&self, sql: &str) -> Result<()> {
+    pub fn execute(&self, sql: &str) -> Result<()> {
         unsafe {
             success!(self, raw::sqlite3_exec(self.raw, str_to_c_str!(sql), None, 0 as *mut _,
                                              0 as *mut _));
@@ -41,7 +41,7 @@ impl<'l> Database<'l> {
     /// The callback is triggered for each row. If the callback returns `false`,
     /// no more rows will be processed.
     #[inline]
-    pub fn iterate<F>(&self, sql: &str, callback: F) -> Result<()>
+    pub fn process<F>(&self, sql: &str, callback: F) -> Result<()>
         where F: FnMut(Vec<(String, String)>) -> bool
     {
         unsafe {
@@ -143,10 +143,10 @@ mod tests {
     );
 
     #[test]
-    fn iterate() {
+    fn execute() {
         let (path, _directory) = setup();
         let database = ok!(Database::open(&path));
-        match database.instruct(":)") {
+        match database.execute(":)") {
             Err(error) => assert_eq!(error.message,
                                      Some(String::from(r#"unrecognized token: ":""#))),
             _ => assert!(false),
diff --git a/tests/lib.rs b/tests/lib.rs
index 5cb97ca..7ec45ce 100644
--- a/tests/lib.rs
+++ b/tests/lib.rs
@@ -21,7 +21,7 @@ fn workflow() {
     let database = ok!(sqlite::open(&path));
 
     let sql = r#"CREATE TABLE `users` (id INTEGER, name VARCHAR(255), age REAL);"#;
-    ok!(database.instruct(sql));
+    ok!(database.execute(sql));
 
     {
         let sql = r#"INSERT INTO `users` (id, name, age) VALUES (?, ?, ?);"#;
@@ -33,7 +33,7 @@ fn workflow() {
     {
         let mut done = false;
         let sql = r#"SELECT * FROM `users`;"#;
-        ok!(database.iterate(sql, |pairs| {
+        ok!(database.process(sql, |pairs| {
             assert!(pairs.len() == 3);
             assert!(pairs[0] == pair!("id", "1"));
             assert!(pairs[1] == pair!("name", "Alice"));