Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Impl PgHasArrayType for serde_json::{Value,RawValue} #1722

Merged
merged 3 commits into from
Feb 23, 2022
Merged

Impl PgHasArrayType for serde_json::{Value,RawValue} #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4292df6
Implement PgHasArrayType for JSON types in the serde_json crate
abreis Feb 22, 2022
f46c919
Remove redundant Type impls for arrays and Vecs of JsonValue
abreis Feb 22, 2022
fcd78c0
Relax an implicit Sized bound to support JsonRawValue
abreis Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions sqlx-core/src/postgres/types/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use crate::postgres::{
};
use crate::types::{Json, Type};
use serde::{Deserialize, Serialize};
use serde_json::value::RawValue as JsonRawValue;
use serde_json::Value as JsonValue;

// <https://www.postgresql.org/docs/12/datatype-json.html>

Expand Down Expand Up @@ -34,6 +36,26 @@ impl<T> PgHasArrayType for Json<T> {
}
}

impl PgHasArrayType for JsonValue {
fn array_type_info() -> PgTypeInfo {
PgTypeInfo::JSONB_ARRAY
}

fn array_compatible(ty: &PgTypeInfo) -> bool {
array_compatible::<JsonValue>(ty)
}
}

impl PgHasArrayType for JsonRawValue {
fn array_type_info() -> PgTypeInfo {
PgTypeInfo::JSONB_ARRAY
}

fn array_compatible(ty: &PgTypeInfo) -> bool {
array_compatible::<JsonRawValue>(ty)
}
}

impl<'q, T> Encode<'q, Postgres> for Json<T>
where
T: Serialize,
Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/src/postgres/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ pub use time_tz::PgTimeTz;
pub use record::{PgRecordDecoder, PgRecordEncoder};

// Type::compatible impl appropriate for arrays
fn array_compatible<E: Type<Postgres>>(ty: &PgTypeInfo) -> bool {
fn array_compatible<E: Type<Postgres> + ?Sized>(ty: &PgTypeInfo) -> bool {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because serde_json::RawValue is unsized:

pub struct RawValue {
    json: str,
}

// we require the declared type to be an _array_ with an
// element type that is acceptable
if let PgTypeKind::Array(element) = &ty.kind() {
Expand Down
28 changes: 0 additions & 28 deletions sqlx-core/src/types/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,34 +56,6 @@ where
}
}

impl<DB> Type<DB> for Vec<JsonValue>
where
Vec<Json<JsonValue>>: Type<DB>,
DB: Database,
{
fn type_info() -> DB::TypeInfo {
<Vec<Json<JsonValue>> as Type<DB>>::type_info()
}

fn compatible(ty: &DB::TypeInfo) -> bool {
<Vec<Json<JsonValue>> as Type<DB>>::compatible(ty)
}
}

impl<DB> Type<DB> for [JsonValue]
where
[Json<JsonValue>]: Type<DB>,
DB: Database,
{
fn type_info() -> DB::TypeInfo {
<[Json<JsonValue>] as Type<DB>>::type_info()
}

fn compatible(ty: &DB::TypeInfo) -> bool {
<[Json<JsonValue>] as Type<DB>>::compatible(ty)
}
}

impl<'q, DB> Encode<'q, DB> for JsonValue
where
for<'a> Json<&'a Self>: Encode<'q, DB>,
Expand Down