diff --git a/postgres-macros/tests/fail-nightly/enum_array_to_enum_literal.stderr b/postgres-macros/tests/fail-nightly/enum_array_to_enum_literal.stderr
index f05e547..7d5376e 100644
--- a/postgres-macros/tests/fail-nightly/enum_array_to_enum_literal.stderr
+++ b/postgres-macros/tests/fail-nightly/enum_array_to_enum_literal.stderr
@@ -8,13 +8,14 @@ error[E0277]: the trait bound `Role: sqlm_postgres::query::Query<sqlm_postgres::
    |         help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <() as sqlm_postgres::query::Query<()>>
-             <Option<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
-             <Option<T> as sqlm_postgres::query::Query<Struct<Cols>>>
-             <Option<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
-             <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-           and $N others
+             `()` implements `sqlm_postgres::query::Query<()>`
+             `Option<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
+             `Option<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
+             `Option<Vec<u8>>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>`
+             `Vec<u8>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
    = note: required for `Sql<'_, sqlm_postgres::types::Array<Vec<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>>>, Role>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-nightly/enum_extra_variant.stderr b/postgres-macros/tests/fail-nightly/enum_extra_variant.stderr
index fba906c..276d1cb 100644
--- a/postgres-macros/tests/fail-nightly/enum_extra_variant.stderr
+++ b/postgres-macros/tests/fail-nightly/enum_extra_variant.stderr
@@ -8,10 +8,10 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
    |                                                          help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
-             <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
+             `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>`
+             `Vec<u8>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
    = note: required for `Sql<'_, Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>, Vec<User>>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-nightly/enum_missing_variant.stderr b/postgres-macros/tests/fail-nightly/enum_missing_variant.stderr
index a743f67..2299fd8 100644
--- a/postgres-macros/tests/fail-nightly/enum_missing_variant.stderr
+++ b/postgres-macros/tests/fail-nightly/enum_missing_variant.stderr
@@ -8,10 +8,10 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
    |                                                          help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
-             <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
+             `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>`
+             `Vec<u8>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
    = note: required for `Sql<'_, Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>, Vec<User>>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-nightly/enum_variant_mismatch.stderr b/postgres-macros/tests/fail-nightly/enum_variant_mismatch.stderr
index e0fa1ff..3e69443 100644
--- a/postgres-macros/tests/fail-nightly/enum_variant_mismatch.stderr
+++ b/postgres-macros/tests/fail-nightly/enum_variant_mismatch.stderr
@@ -8,10 +8,10 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
    |                                                          help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
-             <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
+             `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
+             `Vec<T>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
+             `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>`
+             `Vec<u8>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
    = note: required for `Sql<'_, Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>, Vec<User>>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-nightly/literal_array_to_literal.stderr b/postgres-macros/tests/fail-nightly/literal_array_to_literal.stderr
index 67ae8bc..f536a27 100644
--- a/postgres-macros/tests/fail-nightly/literal_array_to_literal.stderr
+++ b/postgres-macros/tests/fail-nightly/literal_array_to_literal.stderr
@@ -8,13 +8,14 @@ error[E0277]: the trait bound `String: sqlm_postgres::query::Query<sqlm_postgres
   |         help: remove the `.await`
   |
   = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-            <() as sqlm_postgres::query::Query<()>>
-            <Option<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
-            <Option<T> as sqlm_postgres::query::Query<Struct<Cols>>>
-            <Option<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-            <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
-            <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
-            <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
-            <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-          and $N others
+            `()` implements `sqlm_postgres::query::Query<()>`
+            `Option<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
+            `Option<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
+            `Option<Vec<u8>>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
+            `Vec<T>` implements `sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>`
+            `Vec<T>` implements `sqlm_postgres::query::Query<Struct<Cols>>`
+            `Vec<T>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>`
+            `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
+            `Vec<Vec<u8>>` implements `sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>`
+            `Vec<u8>` implements `sqlm_postgres::query::Query<Primitive<Bytea>>`
   = note: required for `Sql<'_, sqlm_postgres::types::Array<Vec<String>>, String>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-stable/enum_array_to_enum_literal.stderr b/postgres-macros/tests/fail-stable/enum_array_to_enum_literal.stderr
index 0675c44..814811a 100644
--- a/postgres-macros/tests/fail-stable/enum_array_to_enum_literal.stderr
+++ b/postgres-macros/tests/fail-stable/enum_array_to_enum_literal.stderr
@@ -8,13 +8,13 @@ error[E0277]: the trait bound `Role: sqlm_postgres::query::Query<sqlm_postgres::
    |         help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
+             <() as sqlm_postgres::query::Query<()>>
+             <Option<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
+             <Option<T> as sqlm_postgres::query::Query<Struct<Cols>>>
+             <Option<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
              <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
+             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
              <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
-             <Option<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Option<T> as sqlm_postgres::query::Query<Struct<Cols>>>
+             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
            and $N others
    = note: required for `Sql<'_, sqlm_postgres::types::Array<Vec<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>>>, Role>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-stable/enum_extra_variant.stderr b/postgres-macros/tests/fail-stable/enum_extra_variant.stderr
index a3dcd81..5f28cc6 100644
--- a/postgres-macros/tests/fail-stable/enum_extra_variant.stderr
+++ b/postgres-macros/tests/fail-stable/enum_extra_variant.stderr
@@ -8,10 +8,10 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
    |                                                          help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
              <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
+             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
              <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
+             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
+             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
+             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
    = note: required for `Sql<'_, Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>, Vec<User>>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-stable/enum_missing_variant.stderr b/postgres-macros/tests/fail-stable/enum_missing_variant.stderr
index 5e0fc8e..3de88b9 100644
--- a/postgres-macros/tests/fail-stable/enum_missing_variant.stderr
+++ b/postgres-macros/tests/fail-stable/enum_missing_variant.stderr
@@ -8,10 +8,10 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
    |                                                          help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
              <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
+             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
              <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
+             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
+             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
+             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
    = note: required for `Sql<'_, Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>, Vec<User>>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-stable/enum_variant_mismatch.stderr b/postgres-macros/tests/fail-stable/enum_variant_mismatch.stderr
index b42bc11..6aad689 100644
--- a/postgres-macros/tests/fail-stable/enum_variant_mismatch.stderr
+++ b/postgres-macros/tests/fail-stable/enum_variant_mismatch.stderr
@@ -8,10 +8,10 @@ error[E0277]: the trait bound `Vec<User>: sqlm_postgres::query::Query<Struct<(St
    |                                                          help: remove the `.await`
    |
    = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
              <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
+             <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
              <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
+             <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
+             <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
+             <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
    = note: required for `Sql<'_, Struct<(StructColumn<i64, 6898215271518772730>, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<5755620910692865178>, EnumVariant<10465144470622129318>)>, 18137070463969723500>)>, Vec<User>>` to implement `IntoFuture`
diff --git a/postgres-macros/tests/fail-stable/literal_array_to_literal.stderr b/postgres-macros/tests/fail-stable/literal_array_to_literal.stderr
index 4aa33fc..89fd2d1 100644
--- a/postgres-macros/tests/fail-stable/literal_array_to_literal.stderr
+++ b/postgres-macros/tests/fail-stable/literal_array_to_literal.stderr
@@ -8,13 +8,13 @@ error[E0277]: the trait bound `String: sqlm_postgres::query::Query<sqlm_postgres
   |         help: remove the `.await`
   |
   = help: the following other types implement trait `sqlm_postgres::query::Query<Cols>`:
-            <Vec<u8> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-            <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-            <Vec<Vec<u8>> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<Bytea>>>>
-            <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
+            <() as sqlm_postgres::query::Query<()>>
+            <Option<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
+            <Option<T> as sqlm_postgres::query::Query<Struct<Cols>>>
+            <Option<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
             <Vec<T> as sqlm_postgres::query::Query<Primitive<<T as SqlType>::Type>>>
+            <Vec<T> as sqlm_postgres::query::Query<Struct<Cols>>>
             <Vec<T> as sqlm_postgres::query::Query<sqlm_postgres::types::Array<Vec<<T as SqlType>::Type>>>>
-            <Option<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
-            <Option<T> as sqlm_postgres::query::Query<Struct<Cols>>>
+            <Vec<Vec<u8>> as sqlm_postgres::query::Query<Primitive<Bytea>>>
           and $N others
   = note: required for `Sql<'_, sqlm_postgres::types::Array<Vec<String>>, String>` to implement `IntoFuture`