From db5ceccf58a81ba80e65ce4ed9d5dc0a5ad47805 Mon Sep 17 00:00:00 2001
From: Ivan Ukhov <ivan.ukhov@gmail.com>
Date: Sat, 6 Oct 2018 10:11:18 +0200
Subject: [PATCH] Rename column_name to name

---
 src/statement.rs | 6 +++---
 tests/lib.rs     | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/statement.rs b/src/statement.rs
index f817b9e..a79b4d4 100644
--- a/src/statement.rs
+++ b/src/statement.rs
@@ -57,7 +57,7 @@ impl<'l> Statement<'l> {
 
     /// Return the name of a column.
     #[inline]
-    pub fn column_name(&self, i: usize) -> &str {
+    pub fn name(&self, i: usize) -> &str {
         debug_assert!(i < self.columns(), format!("column position has to be between 0 and {}", self.columns() - 1));
         unsafe {
             let ret = ffi::sqlite3_column_name(self.raw.0, i as c_int);
@@ -67,8 +67,8 @@ impl<'l> Statement<'l> {
 
     /// Return column names.
     #[inline]
-    pub fn column_names(&self) -> Vec<&str> {
-        (0..self.columns()).map(|i| self.column_name(i)).collect()
+    pub fn names(&self) -> Vec<&str> {
+        (0..self.columns()).map(|i| self.name(i)).collect()
     }
 
     /// Return the type of a column.
diff --git a/tests/lib.rs b/tests/lib.rs
index 9295089..5501c69 100644
--- a/tests/lib.rs
+++ b/tests/lib.rs
@@ -146,17 +146,16 @@ fn statement_columns() {
 }
 
 #[test]
-fn statement_column_name() {
+fn statement_name() {
     let connection = setup_users(":memory:");
     let statement = "SELECT id, name, age, photo as user_photo FROM users";
     let statement = ok!(connection.prepare(statement));
 
     assert_eq!(statement.columns(), 4);
 
-    let column_names = statement.column_names();
-    assert_eq!(column_names, vec!["id", "name", "age", "user_photo"]);
-    assert_eq!("user_photo", statement.column_name(3));
-
+    let names = statement.names();
+    assert_eq!(names, vec!["id", "name", "age", "user_photo"]);
+    assert_eq!("user_photo", statement.name(3));
 }
 
 #[test]