dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix serde-json

Browse Source
This commit is contained in:
Steven Fackler 2019-11-26 16:43:10 -08:00
parent 7eb61c786b
commit 4a51a7e00a
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
postgres-types/src/serde_json_1.rs
View File

@ -1,3 +1,5 @@
use crate::{FromSql, IsNull, ToSql, Type};
use bytes::buf::BufMutExt;
use bytes::{BufMut, BytesMut}; use bytes::{BufMut, BytesMut};
use serde_1::{Deserialize, Serialize}; use serde_1::{Deserialize, Serialize};
use serde_json_1::Value; use serde_json_1::Value;
@ -5,32 +7,6 @@ use std::error::Error;
use std::fmt::Debug; use std::fmt::Debug;
use std::io::Read; use std::io::Read;
use crate::{FromSql, IsNull, ToSql, Type};
// https://github.com/tokio-rs/bytes/issues/170
struct B<'a>(&'a mut BytesMut);
impl<'a> BufMut for B<'a> {
#[inline]
fn remaining_mut(&self) -> usize {
usize::max_value() - self.0.len()
}
#[inline]
unsafe fn advance_mut(&mut self, cnt: usize) {
self.0.advance_mut(cnt);
}
#[inline]
unsafe fn bytes_mut(&mut self) -> &mut [u8] {
if !self.0.has_remaining_mut() {
self.0.reserve(64);
}
self.0.bytes_mut()
}
}
/// A wrapper type to allow arbitrary `Serialize`/`Deserialize` types to convert to Postgres JSON values. /// A wrapper type to allow arbitrary `Serialize`/`Deserialize` types to convert to Postgres JSON values.
#[derive(Debug)] #[derive(Debug)]
pub struct Json<T>(pub T); pub struct Json<T>(pub T);
@ -66,9 +42,9 @@ where
out: &mut BytesMut, out: &mut BytesMut,
) -> Result<IsNull, Box<dyn Error + Sync + Send>> { ) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
if *ty == Type::JSONB { if *ty == Type::JSONB {
B(out).put_u8(1); out.put_u8(1);
} }
serde_json_1::ser::to_writer(B(out).writer(), &self.0)?; serde_json_1::ser::to_writer(out.writer(), &self.0)?;
Ok(IsNull::No) Ok(IsNull::No)
} }