execute request

Author: tanner0101

Sources/PostgreSQL/Message/Base/PostgreSQLMessage.swift

@@ -13,10 +13,14 @@ enum PostgreSQLMessage {
     case dataRow(PostgreSQLDataRow)
     case close(PostgreSQLCloseCommand)
     case parse(PostgreSQLParseRequest)
+    /// Identifies the message as a Bind command.
+    case bind(PostgreSQLBindRequest)
+    /// Identifies the message as an Execute command.
+    case execute(PostgreSQLExecuteRequest)
     /// Identifies the message as a Sync command.
     case sync
     /// Identifies the message as a Parse-complete indicator.
     case parseComplete
-    /// Identifies the message as a Bind command.
-    case bind(PostgreSQLBindRequest)
+    /// Identifies the message as a Bind-complete indicator.
+    case bindComplete
 }

Sources/PostgreSQL/Message/Messages/PostgreSQLExecuteRequest.swift

@@ -0,0 +1,9 @@
+/// Identifies the message as an Execute command.
+struct PostgreSQLExecuteRequest: Encodable {
+    /// The name of the destination portal (an empty string selects the unnamed portal).
+    var portalName: String
+
+    /// Maximum number of rows to return, if portal contains a query that
+    /// returns rows (ignored otherwise). Zero denotes “no limit”.
+    var maxRows: Int32
+}

Sources/PostgreSQL/Message/PostgreSQLMessageDecoder.swift

@@ -29,6 +29,7 @@ final class PostgreSQLMessageDecoder {
         case .D: message = try .dataRow(decoder.decode())
         case .C: message = try .close(decoder.decode())
         case .one: message = .parseComplete
+        case .two: message = .bindComplete
         default:
             let string = String(bytes: [type], encoding: .ascii) ?? "n/a"
             fatalError("Unrecognized message type: \(string) (\(type)")

Sources/PostgreSQL/Message/PostgreSQLMessageEncoder.swift

@@ -25,6 +25,9 @@ final class PostgreSQLMessageEncoder {
         case .bind(let bind):
             identifier = .B
             try bind.encode(to: encoder)
+        case .execute(let execute):
+            identifier = .E
+            try execute.encode(to: encoder)
         default: fatalError("Unsupported encodable type: \(type(of: message))")
         }
         encoder.updateSize()

Sources/PostgreSQL/PostgreSQLClient.swift

@@ -68,7 +68,11 @@ final class PostgreSQLClient {
         }
     }
 
-    func parameterizedQuery(_ string: String, _ parameters: [PostgreSQLData] = []) throws -> Future<Void> {
+    func parameterizedQuery(
+        _ string: String,
+        _ parameters: [PostgreSQLData] = [],
+        onRow: @escaping ([String: PostgreSQLData]) -> ()
+    ) throws -> Future<Void> {
         let parse = PostgreSQLParseRequest(
             statementName: "",
             query: string,
@@ -81,12 +85,29 @@ final class PostgreSQLClient {
             parameters: parameters.map { try .serialize(data: $0) },
             resultFormatCodes: [.binary]
         )
-        return queueStream.enqueue([.parse(parse), .bind(bind)]) { message in
+        let execute = PostgreSQLExecuteRequest(
+            portalName: "",
+            maxRows: 0
+        )
+        var currentRow: PostgreSQLRowDescription?
+        return queueStream.enqueue([
+            .parse(parse), .bind(bind), .execute(execute), .sync
+        ]) { message in
             print(message)
             switch message {
-            case .parseComplete: return false
             case .errorResponse(let e): throw e
-            case .readyForQuery: return false
+            case .parseComplete: return false
+            case .bindComplete: return false
+            case .rowDescription(let row):
+                currentRow = row
+                return false
+            case .dataRow(let data):
+                let row = currentRow !! "Unexpected PostgreSQLDataRow without preceding PostgreSQLRowDescription."
+                let parsed = try row.parse(data: data)
+                onRow(parsed)
+                return false
+            case .close: return false
+            case .readyForQuery: return true
             default: fatalError("Unexpected message during PostgreSQLParseRequest: \(message)")
             }
         }