From e82c8879495eddaf0e3202b89307128e1b3576d3 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 31 Aug 2013 21:55:15 -0700
Subject: [PATCH] Restructure result API for row limits

Work towards #13.
---
 src/lib.rs  | 38 +++++++++++++-------------------------
 src/test.rs | 10 +++++-----
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 38936512..67f0bb99 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -520,6 +520,8 @@ impl<'self> PostgresStatement<'self> {
         }
         self.conn.wait_for_ready();
 
+        // we're going to be popping rows off
+        data.reverse();
         Ok(PostgresResult {
             stmt: self,
             name: portal_name,
@@ -554,48 +556,34 @@ impl<'self> Drop for PostgresResult<'self> {
     }
 }
 
-impl<'self> PostgresResult<'self> {
-    pub fn iter<'a>(&'a self) -> PostgresResultIterator<'a> {
-        PostgresResultIterator { result: self, next_row: 0 }
-    }
-}
-
-pub struct PostgresResultIterator<'self> {
-    priv result: &'self PostgresResult<'self>,
-    priv next_row: uint
-}
-
-impl<'self> Iterator<PostgresRow<'self>> for PostgresResultIterator<'self> {
-    fn next(&mut self) -> Option<PostgresRow<'self>> {
-        if self.next_row == self.result.data.len() {
+impl<'self> Iterator<PostgresRow> for PostgresResult<'self> {
+    fn next(&mut self) -> Option<PostgresRow> {
+        if self.data.is_empty() {
             return None;
         }
 
-        let row = self.next_row;
-        self.next_row += 1;
-        Some(PostgresRow { result: self.result, row: row })
+        Some(PostgresRow { data: self.data.pop() })
     }
 }
 
-pub struct PostgresRow<'self> {
-    priv result: &'self PostgresResult<'self>,
-    priv row: uint
+pub struct PostgresRow {
+    priv data: ~[Option<~[u8]>]
 }
 
-impl<'self> Container for PostgresRow<'self> {
+impl<'self> Container for PostgresRow {
     fn len(&self) -> uint {
-        self.result.data[self.row].len()
+        self.data.len()
     }
 }
 
-impl<'self, T: FromSql> Index<uint, T> for PostgresRow<'self> {
+impl<T: FromSql> Index<uint, T> for PostgresRow {
     fn index(&self, idx: &uint) -> T {
         self.get(*idx)
     }
 }
 
-impl<'self> PostgresRow<'self> {
+impl PostgresRow {
     pub fn get<T: FromSql>(&self, idx: uint) -> T {
-        FromSql::from_sql(&self.result.data[self.row][idx])
+        FromSql::from_sql(&self.data[idx])
     }
 }
diff --git a/src/test.rs b/src/test.rs
index a6c1da9e..24e94422 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -48,7 +48,7 @@ fn test_query() {
         let stmt = trans.prepare("SELECT * from foo ORDER BY id");
         let result = stmt.query([]);
 
-        assert_eq!(~[1, 2], result.iter().map(|row| { row[0] }).collect());
+        assert_eq!(~[1, 2], result.map(|row| { row[0] }).collect());
     }
 }
 
@@ -66,7 +66,7 @@ fn test_nulls() {
         let result = stmt.query([]);
 
         assert_eq!(~[Some(~"foobar"), None],
-                   result.iter().map(|row| { row[0] }).collect());
+                   result.map(|row| { row[0] }).collect());
 
         trans.set_rollback();
     }
@@ -86,7 +86,7 @@ fn test_param_type<T: Eq+ToSql+FromSql>(sql_type: &str, values: &[T]) {
         let stmt = trans.prepare("SELECT b FROM foo ORDER BY id");
         let result = stmt.query([]);
 
-        let actual_values: ~[T] = result.iter().map(|row| { row[0] }).collect();
+        let actual_values: ~[T] = result.map(|row| { row[0] }).collect();
         assert_eq!(values, actual_values.as_slice());
     }
 }
@@ -136,8 +136,8 @@ fn test_nan_param<T: Float+ToSql+FromSql>(sql_type: &str) {
                 .update([&nan as &ToSql]);
 
         let stmt = trans.prepare("SELECT b FROM foo");
-        let result = stmt.query([]);
-        let val: T = result.iter().next().unwrap()[0];
+        let mut result = stmt.query([]);
+        let val: T = result.next().unwrap()[0];
         assert!(val.is_NaN());
     }
 }