Return BoxStream of PgRow

[AdminCrystal]

I have an odd issue and its probably just a skill issue tbh. Issue stems from me storing protobuf Any type as two separate columns in the database since I cant implement fromRow for it. Prost Any has type_url and value and that is how I am storing the protobufs instead of in a single column.

Given this proto type

message WinkMessage {
  google.protobuf.Any payload = 1;
  string topic = 2;
  int32 partition = 3;
  int32 partition_offset = 4;
  optional string partition_key = 5;
}

How it is generated by prost

// This file is @generated by prost-build.
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct WinkMessage {
    #[prost(message, optional, tag = "1")]
    pub payload: ::core::option::Option<::prost_types::Any>,
    #[prost(string, tag = "2")]
    pub topic: ::prost::alloc::string::String,
    #[prost(int32, tag = "3")]
    pub partition: i32,
    #[prost(int32, tag = "4")]
    pub partition_offset: i32,
    #[prost(string, optional, tag = "5")]
    pub partition_key: ::core::option::Option<::prost::alloc::string::String>,
}

And this select statement

SELECT payload, type_url, topic_name, partition, partition_offset, partition_key
FROM wink_messages wm

I want to be able to Return either

BoxStream<'a, Result<WinkMessage, Error>>

or

BoxStream<'a, Result<PgRow, Error>>

Example function

pub fn get_wink_messages<'a>(
    txn: &'a mut Transaction<'_, Postgres>,
    message_request: &SpecificMessageRequest,
) -> BoxStream<'a, Result<PgRow, Error>> {
    let mut rows = sqlx::query_file!(
        "queries/wink_repository/get_wink_messages.sql"
    )
    .fetch(&mut **txn);

    return rows;
}

Above does not compile with error

error[E0308]: mismatched types
   --> wink\src\repository\wink_repository.rs:133:12
    |
127 | ) -> BoxStream<'a, Result<PgRow, Error>> {
    |      ----------------------------------- expected `Pin<Box<(dyn Stream<Item = Result<PgRow, sqlx::Error>> + std::marker::Send + 'a)>>` because of return type
...
133 |     return rows;
    |            ^^^^ expected `PgRow`, found `Record`
    |
    = note: expected struct `Pin<Box<(dyn Stream<Item = Result<PgRow, sqlx::Error>> + std::marker::Send + 'a)>>`
               found struct `Pin<Box<dyn Stream<Item = Result<get_wink_messages::{closure#0}::Record, sqlx::Error>> + std::marker::Send>>`

I have found a workaround doing this but just curious if I am missing something to avoid this workaround

pub(crate) struct WinkMessageRow {
    payload: Vec<u8>,
    type_url: Option<String>,
    topic_name: String,
    partition: i32,
    partition_offset: i32,
    partition_key: Option<String>,
}

impl WinkMessageRow {
    pub(crate) fn to_wink_message(self) -> WinkMessage {
        let payload = prost_types::Any {
            type_url: self.type_url.unwrap(),
            value: self.payload,
        };
        let wink_message = WinkMessage {
            payload: Some(payload),
            topic: self.topic_name,
            partition: self.partition,
            partition_offset: self.partition_offset,
            partition_key: self.partition_key,
        };

        return wink_message;
    }
}

pub fn get_wink_messages<'a>(
    txn: &'a mut Transaction<'_, Postgres>,
    message_request: &MessageRequest,
) -> BoxStream<'a, Result<WinkMessageRow, Error>> {
    let mut rows = sqlx::query_file_as!(
        WinkMessageRow,
        "queries/wink_repository/get_wink_messages.sql"
    )
    .fetch(&mut **txn);

    return rows;
}