From 566d164d2aebcdf347f6ffe4d6542566d8b2f7a6 Mon Sep 17 00:00:00 2001
From: Kould <kould2333@gmail.com>
Date: Sat, 21 Dec 2024 01:57:10 +0800
Subject: [PATCH] chore: fix server.rs

---
 src/bin/server.rs | 30 ++++++++++++++++++------------
 src/db.rs         |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/bin/server.rs b/src/bin/server.rs
index f45edd9..6cbf773 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -172,19 +172,25 @@ impl SimpleQueryHandler for SessionBackend {
             _ => {
                 let mut guard = self.tx.lock();
 
-                let iter = if let Some(transaction) = guard.as_mut() {
-                    unsafe { transaction.as_mut().run(query) }.map(Box::new)
-                        as Result<Box<dyn ResultIter>, _>
-                } else {
-                    self.inner.run(query).map(Box::new)
-                }
-                .map_err(|e| PgWireError::ApiError(Box::new(e)))?;
-
                 let mut tuples = Vec::new();
-                for tuple in iter {
-                    tuples.push(tuple.map_err(|e| PgWireError::ApiError(Box::new(e)))?);
-                }
-                Ok(vec![Response::Query(encode_tuples(iter.schema(), tuples)?)])
+                let response = if let Some(transaction) = guard.as_mut() {
+                    let mut iter = unsafe { transaction.as_mut().run(query) }
+                        .map_err(|e| PgWireError::ApiError(Box::new(e)))?;
+                    for tuple in iter.by_ref() {
+                        tuples.push(tuple.map_err(|e| PgWireError::ApiError(Box::new(e)))?);
+                    }
+                    encode_tuples(iter.schema(), tuples)?
+                } else {
+                    let mut iter = self
+                        .inner
+                        .run(query)
+                        .map_err(|e| PgWireError::ApiError(Box::new(e)))?;
+                    for tuple in iter.by_ref() {
+                        tuples.push(tuple.map_err(|e| PgWireError::ApiError(Box::new(e)))?);
+                    }
+                    encode_tuples(iter.schema(), tuples)?
+                };
+                Ok(vec![Response::Query(response)])
             }
         }
     }
diff --git a/src/db.rs b/src/db.rs
index a7379ad..2362848 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -328,7 +328,7 @@ impl<S: Storage> Database<S> {
     }
 }
 
-pub trait ResultIter: Iterator<Item = Result<Tuple, DatabaseError>> + Sized {
+pub trait ResultIter: Iterator<Item = Result<Tuple, DatabaseError>> {
     fn schema(&self) -> &SchemaRef;
 
     fn done(self) -> Result<(), DatabaseError>;