revert unneeded changes

Author: MahdiBM

Sources/PostgresNIO/Connection/PostgresConnection.swift

@@ -463,9 +463,13 @@ extension PostgresConnection {
         self.channel.write(HandlerTask.extendedQuery(context), promise: nil)
 
         do {
-            let rowSequence = try await promise.futureResult.map({ $0.asyncSequence() }).get()
+            let rowStream = try await promise.futureResult.get()
+            let rowSequence = rowStream.asyncSequence()
             let result = try await consume(rowSequence)
-            let metadata = try await rowSequence.drainAndCollectMetadata()
+            try await rowStream.drain().get()
+            guard let metadata = PostgresQueryMetadata(string: rowStream.commandTag) else {
+                throw PSQLError.invalidCommandTag(rowStream.commandTag)
+            }
             return (result, metadata)
         } catch var error as PSQLError {
             error.file = file
@@ -593,8 +597,11 @@ extension PostgresConnection {
         self.channel.write(HandlerTask.extendedQuery(context), promise: nil)
 
         do {
-            let rowSequence = try await promise.futureResult.map({ $0.asyncSequence() }).get()
-            let metadata = try await rowSequence.drainAndCollectMetadata()
+            let rowStream = try await promise.futureResult.get()
+            try await rowStream.drain().get()
+            guard let metadata = PostgresQueryMetadata(string: rowStream.commandTag) else {
+                throw PSQLError.invalidCommandTag(rowStream.commandTag)
+            }
             return metadata
         } catch var error as PSQLError {
             error.file = file

Sources/PostgresNIO/New/PSQLRowStream.swift

@@ -44,7 +44,7 @@ final class PSQLRowStream: @unchecked Sendable {
     }
 
     internal let rowDescription: [RowDescription.Column]
-    internal let lookupTable: [String: Int]
+    private let lookupTable: [String: Int]
     private var downstreamState: DownstreamState
 
     init(
@@ -114,7 +114,7 @@ final class PSQLRowStream: @unchecked Sendable {
             self.downstreamState = .consumed(.failure(error))
         }
 
-        return PostgresRowSequence(producer.sequence, rowStream: self)
+        return PostgresRowSequence(producer.sequence, lookupTable: self.lookupTable, columns: self.rowDescription)
     }
 
     func demand() {

Sources/PostgresNIO/New/PostgresRowSequence.swift

@@ -9,18 +9,14 @@ public struct PostgresRowSequence: AsyncSequence, Sendable {
 
     typealias BackingSequence = NIOThrowingAsyncSequenceProducer<DataRow, Error, AdaptiveRowBuffer, PSQLRowStream>
 
-    private let backing: BackingSequence
-    private let rowStream: PSQLRowStream
-    var lookupTable: [String: Int] {
-        self.rowStream.lookupTable
-    }
-    var columns: [RowDescription.Column] {
-        self.rowStream.rowDescription
-    }
+    let backing: BackingSequence
+    let lookupTable: [String: Int]
+    let columns: [RowDescription.Column]
 
-    init(_ backing: BackingSequence, rowStream: PSQLRowStream) {
+    init(_ backing: BackingSequence, lookupTable: [String: Int], columns: [RowDescription.Column]) {
         self.backing = backing
-        self.rowStream = rowStream
+        self.lookupTable = lookupTable
+        self.columns = columns
     }
 
     public func makeAsyncIterator() -> AsyncIterator {
@@ -30,10 +26,6 @@ public struct PostgresRowSequence: AsyncSequence, Sendable {
             columns: self.columns
         )
     }
-
-    func drain() {
-        self.backing
-    }
 }
 
 extension PostgresRowSequence {
@@ -68,15 +60,14 @@ extension PostgresRowSequence {
 extension PostgresRowSequence.AsyncIterator: Sendable {}
 
 extension PostgresRowSequence {
-    /// Collects the query metadata.
-    /// Should be called after the sequence is consumed, otherwise throws `PSQLError`.
-    /// - Returns: The metadata.
-    func drainAndCollectMetadata() async throws -> PostgresQueryMetadata {
-        try await self.rowStream.drain().get()
-        guard let metadata = PostgresQueryMetadata(string: self.rowStream.commandTag) else {
-            throw PSQLError.invalidCommandTag(self.rowStream.commandTag)
+    /// Collects all rows into an array.
+    /// - Returns: The rows.
+    public func collect() async throws -> [PostgresRow] {
+        var result = [PostgresRow]()
+        for try await row in self {
+            result.append(row)
         }
-        return metadata
+        return result
     }
 }