Skip to content

Refactor #1034

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

Open
Huliiiiii wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Refactor #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
74dd8aa
Add missing Array::Null to try_from_value
Huliiiiii Dec 28, 2025
39d2b35
Make null arrays no longer be treated as empty
Huliiiiii Dec 28, 2025
bb8a2e9
Fix as_ref_array
Huliiiiii Dec 28, 2025
fc97cb3
Clippy
Huliiiiii Dec 28, 2025
87ea4c6
Add tests
Huliiiiii Dec 28, 2025
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
15 changes: 15 additions & 0 deletions src/backend/query_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,4 +1866,19 @@ mod tests {

compare!(date_time_tz, "'2015-06-03 20:34:56.123456 +08:00'");
}

#[test]
#[cfg(feature = "postgres-array")]
fn prepare_array_null_and_empty() {
use crate::{Array, ArrayType, PostgresQueryBuilder, QueryBuilder, Value};

let mut string = String::new();
PostgresQueryBuilder
.prepare_value(Value::Array(Array::Null(ArrayType::String)), &mut string);
assert_eq!(string, "NULL");

string.clear();
PostgresQueryBuilder.prepare_value(Vec::<String>::new().into(), &mut string);
assert_eq!(string, "'{}'");
}
}
4 changes: 2 additions & 2 deletions src/value/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ impl Array {
Array::IpNetwork(v) => v.is_empty(),
#[cfg(feature = "with-mac_address")]
Array::MacAddress(v) => v.is_empty(),
Array::Null(_) => true,
Array::Null(_) => false,
Copy link
Member

@tyt2y3 tyt2y3 Dec 28, 2025

Choose a reason for hiding this comment

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

umm Null should be empty right?

Copy link
Member Author

@Huliiiiii Huliiiiii Dec 28, 2025

Choose a reason for hiding this comment

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

We have the is_null method.

Copy link
Member Author

@Huliiiiii Huliiiiii Dec 28, 2025

Choose a reason for hiding this comment

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

empty array => '{}'
null array => NULL

}
}

Expand Down Expand Up @@ -530,7 +530,7 @@ impl std::fmt::Debug for ArrayIterValue<'_> {
}
}

impl<'a> Iterator for ArrayIterValue<'a> {
impl Iterator for ArrayIterValue<'_> {
type Item = Option<Value>;

fn next(&mut self) -> Option<Self::Item> {
Expand Down
205 changes: 205 additions & 0 deletions src/value/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,3 +424,208 @@ fn test_option_array_value() {
let out: Option<Vec<Option<i32>>> = v.unwrap();
assert_eq!(out, None);
}

#[test]
#[cfg(feature = "postgres-array")]
fn test_try_from_value_array() {
fn assert_try_from_value_array<T>(v1: T, v2: T)
where
T: ArrayElement + Clone + PartialEq + std::fmt::Debug,
{
let expected = vec![Some(v1.clone()), None, Some(v2.clone())];
let value: Value = expected.clone().into();
let out = T::try_from_value(value).unwrap();
assert_eq!(out, expected);

let value = Value::Array(Array::Null(T::ArrayValueType::array_type()));
let out = T::try_from_value(value).unwrap();
assert_eq!(out, Vec::<Option<T>>::new());
}

assert_try_from_value_array(true, false);
assert_try_from_value_array(-1i8, 2);
assert_try_from_value_array(-2i16, 3);
assert_try_from_value_array(-3i32, 4);
assert_try_from_value_array(-4i64, 5);
assert_try_from_value_array(6u16, 7);
assert_try_from_value_array(8u32, 9);
assert_try_from_value_array(10u64, 11);
assert_try_from_value_array(1.5f32, 2.5);
assert_try_from_value_array(3.25f64, 4.75);
assert_try_from_value_array(String::from("a"), String::from("b"));
assert_try_from_value_array('a', 'b');
assert_try_from_value_array(vec![1, 2, 3], vec![4, 5, 6]);

#[cfg(feature = "with-json")]
{
assert_try_from_value_array(serde_json::json!({"a": 1}), serde_json::json!({"b": 2}));
}

#[cfg(feature = "with-chrono")]
{
assert_try_from_value_array(
NaiveDate::from_ymd_opt(2020, 1, 1).unwrap(),
NaiveDate::from_ymd_opt(2021, 2, 2).unwrap(),
);
assert_try_from_value_array(
NaiveTime::from_hms_opt(1, 2, 3).unwrap(),
NaiveTime::from_hms_opt(4, 5, 6).unwrap(),
);
assert_try_from_value_array(
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(1, 2, 3)
.unwrap(),
NaiveDate::from_ymd_opt(2021, 2, 2)
.unwrap()
.and_hms_opt(4, 5, 6)
.unwrap(),
);
assert_try_from_value_array(
DateTime::<Utc>::from_utc(
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(1, 2, 3)
.unwrap(),
Utc,
),
DateTime::<Utc>::from_utc(
NaiveDate::from_ymd_opt(2021, 2, 2)
.unwrap()
.and_hms_opt(4, 5, 6)
.unwrap(),
Utc,
),
);
assert_try_from_value_array(
chrono::TimeZone::from_utc_datetime(
&Local,
&NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(1, 2, 3)
.unwrap(),
),
chrono::TimeZone::from_utc_datetime(
&Local,
&NaiveDate::from_ymd_opt(2021, 2, 2)
.unwrap()
.and_hms_opt(4, 5, 6)
.unwrap(),
),
);
assert_try_from_value_array(
DateTime::<FixedOffset>::from_utc(
NaiveDate::from_ymd_opt(2020, 1, 1)
.unwrap()
.and_hms_opt(1, 2, 3)
.unwrap(),
FixedOffset::east_opt(0).unwrap(),
),
DateTime::<FixedOffset>::from_utc(
NaiveDate::from_ymd_opt(2021, 2, 2)
.unwrap()
.and_hms_opt(4, 5, 6)
.unwrap(),
FixedOffset::east_opt(0).unwrap(),
),
);
}

#[cfg(feature = "with-time")]
{
assert_try_from_value_array(
time::Date::from_calendar_date(2020, time::Month::January, 1).unwrap(),
time::Date::from_calendar_date(2021, time::Month::February, 2).unwrap(),
);
assert_try_from_value_array(
time::Time::from_hms(1, 2, 3).unwrap(),
time::Time::from_hms(4, 5, 6).unwrap(),
);
assert_try_from_value_array(
PrimitiveDateTime::new(
time::Date::from_calendar_date(2020, time::Month::January, 1).unwrap(),
time::Time::from_hms(1, 2, 3).unwrap(),
),
PrimitiveDateTime::new(
time::Date::from_calendar_date(2021, time::Month::February, 2).unwrap(),
time::Time::from_hms(4, 5, 6).unwrap(),
),
);
assert_try_from_value_array(
OffsetDateTime::from_unix_timestamp(0).unwrap(),
OffsetDateTime::from_unix_timestamp(60).unwrap(),
);
}

#[cfg(feature = "with-jiff")]
{
assert_try_from_value_array(jiff::civil::date(2020, 1, 1), jiff::civil::date(2021, 2, 2));
assert_try_from_value_array(
jiff::civil::time(1, 2, 3, 123456 * 1000),
jiff::civil::time(4, 5, 6, 234567 * 1000),
);
assert_try_from_value_array(
jiff::civil::date(2020, 1, 1).at(1, 2, 3, 123456 * 1000),
jiff::civil::date(2021, 2, 2).at(4, 5, 6, 234567 * 1000),
);
assert_try_from_value_array(
jiff::Timestamp::constant(0, 123456 * 1000),
jiff::Timestamp::constant(1, 234567 * 1000),
);
assert_try_from_value_array(
jiff::fmt::strtime::parse(
"%Y-%m-%d %H:%M:%S%.6f %:z",
"1970-01-01 00:00:00.123456 +00:00",
)
.unwrap()
.to_zoned()
.unwrap(),
jiff::fmt::strtime::parse(
"%Y-%m-%d %H:%M:%S%.6f %:z",
"1970-01-01 00:00:00.234567 +00:00",
)
.unwrap()
.to_zoned()
.unwrap(),
);
}

#[cfg(feature = "with-uuid")]
{
assert_try_from_value_array(Uuid::from_bytes([1; 16]), Uuid::from_bytes([2; 16]));
}

#[cfg(feature = "with-rust_decimal")]
{
assert_try_from_value_array(Decimal::new(123, 2), Decimal::new(456, 2));
}

#[cfg(feature = "with-bigdecimal")]
{
assert_try_from_value_array(BigDecimal::from(123), BigDecimal::from(456));
}

#[cfg(feature = "with-ipnetwork")]
{
assert_try_from_value_array(
IpNetwork::new(
std::net::IpAddr::V4(std::net::Ipv4Addr::new(192, 168, 0, 1)),
24,
)
.unwrap(),
IpNetwork::new(
std::net::IpAddr::V4(std::net::Ipv4Addr::new(10, 0, 0, 1)),
16,
)
.unwrap(),
);
}

#[cfg(feature = "with-mac_address")]
{
assert_try_from_value_array(
MacAddress::new([0, 1, 2, 3, 4, 5]),
MacAddress::new([6, 7, 8, 9, 10, 11]),
);
}
}
16 changes: 11 additions & 5 deletions src/value/with_array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ macro_rules! impl_value_vec {
fn try_from_value(v: Value) -> Result<Vec<Option<Self>>, ValueTypeErr> {
match v {
Value::Array(Array::$vari(inner)) => Ok(inner.into_vec()),
Value::Array(Array::Null(ArrayType::$vari)) => Ok(vec![]),
_ => Err(ValueTypeErr)
}
}
Expand Down Expand Up @@ -106,6 +107,7 @@ impl ValueType for Vec<Option<u8>> {
fn try_from(v: Value) -> Result<Self, ValueTypeErr> {
match v {
Value::Array(Array::TinyUnsigned(inner)) => Ok(inner.into_vec()),
Value::Array(Array::Null(ArrayType::TinyUnsigned)) => Ok(vec![]),
_ => Err(ValueTypeErr),
}
}
Expand Down Expand Up @@ -195,7 +197,7 @@ macro_rules! impl_uuid_fmt_pg_array_element {
.into_iter()
.map(|opt| opt.map(Self::from))
.collect()),
Value::Array(Array::Null(_)) => Ok(vec![]),
Value::Array(Array::Null(ArrayType::Uuid)) => Ok(vec![]),
_ => Err(ValueTypeErr),
}
}
Expand Down Expand Up @@ -241,11 +243,15 @@ impl Value {
matches!(self, Self::Array(_))
}

pub fn as_ref_array(&self) -> Option<&Array> {
pub fn as_array(&self) -> Option<&Array> {
match self {
Self::Array(v) if !v.is_null() => Some(v),
Self::Array(_) => None,
_ => panic!("not Value::Array"),
Self::Array(v) => Some(v),
_ => None,
}
}

#[deprecated(since = "1.0.0", note = "Use Value::as_array instead.")]
pub fn as_ref_array(&self) -> Option<&Array> {
self.as_array()
}
}
Loading