itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-29 21:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(postgres): return IsNull from Encode::encode

Browse Source
This commit is contained in:
Ryan Leckey 2021-04-16 11:49:20 -07:00
parent 76b31faf4c
commit 2ff36167b7
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sqlx-postgres/src/types/bool.rs
View File

@ -14,10 +14,10 @@ impl Type<Postgres> for bool {
}
impl Encode<Postgres> for bool {
fn encode(&self, _ty: &PgTypeInfo, out: &mut PgOutput<'_>) -> encode::Result<()> {
fn encode(&self, _ty: &PgTypeInfo, out: &mut PgOutput<'_>) -> encode::Result {
out.buffer().push(*self as u8);
Ok(())
Ok(encode::IsNull::No)
}
}

30
sqlx-postgres/src/types/int.rs
View File

@ -12,23 +12,17 @@ use crate::{PgOutput, PgRawValue, PgRawValueFormat, PgTypeId, PgTypeInfo, Postgr
// check that the incoming value is not too large or too small
// to fit into the target SQL type
fn ensure_not_too_large_or_too_small(value: i128, ty: &PgTypeInfo) -> encode::Result<()> {
let max: i128 = match ty.id() {
PgTypeId::SMALLINT => i16::MAX as _,
PgTypeId::INTEGER => i32::MAX as _,
PgTypeId::BIGINT => i64::MAX as _,
fn ensure_not_too_large_or_too_small(value: i128, ty: &PgTypeInfo) -> Result<(), encode::Error> {
let (max, min): (i128, i128) = match ty.id() {
PgTypeId::SMALLINT => (i16::MAX as _, i16::MIN as _),
PgTypeId::INTEGER => (i32::MAX as _, i32::MIN as _),
PgTypeId::BIGINT => (i64::MAX as _, i64::MIN as _),
// not an integer type
_ => unreachable!(),
};
let min: i128 = match ty.id() {
PgTypeId::SMALLINT => i16::MIN as _,
PgTypeId::INTEGER => i32::MIN as _,
PgTypeId::BIGINT => i64::MIN as _,
// not an integer type
_ => unreachable!(),
_ => {
// for non-integer types, ignore the check
// if we got this far its because someone asked for and `_unchecked` bind
return Ok(());
}
};
if value > max {
@ -80,12 +74,12 @@ macro_rules! impl_type_int {
}
impl Encode<Postgres> for $ty {
fn encode(&self, ty: &PgTypeInfo, out: &mut PgOutput<'_>) -> encode::Result<()> {
fn encode(&self, ty: &PgTypeInfo, out: &mut PgOutput<'_>) -> encode::Result {
ensure_not_too_large_or_too_small((*self $(as $real)?).into(), ty)?;
out.buffer().extend_from_slice(&self.to_be_bytes());
Ok(())
Ok(encode::IsNull::No)
}
}