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

Bind array values in SQLx PostgreSQL driver #225

Closed
wants to merge 2 commits into from
Closed

Bind array values in SQLx PostgreSQL driver #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54524cb
Revert "Leave out SQLx Postgres array support for now"
billy1624 Jan 9, 2022
b80a68f
feat: bind array values in SQLx PostgreSQL driver
billy1624 Jan 9, 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
10 changes: 9 additions & 1 deletion examples/sqlx_postgres/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ sea-query = { path = "../../", features = [
"with-rust_decimal",
"with-bigdecimal",
"with-uuid",
"postgres-array",
] }
# NOTE: if you are copying this example into your own project, use the following line instead:
# sea-query = { version = "^0", features = [...] }
# sea-query = { version = "^0", features = [
# "sqlx-postgres",
# "with-chrono",
# "with-json",
# "with-rust_decimal",
# "with-bigdecimal",
# "with-uuid",
# ] }

[dependencies.sqlx]
version = "^0.5"
Expand Down
44 changes: 43 additions & 1 deletion src/driver/sqlx_postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,49 @@ macro_rules! bind_params_sqlx_postgres {
} else if value.is_uuid() {
query.bind(value.as_ref_uuid())
} else if value.is_array() {
unimplemented!("SQLx array is not supported");
if value.is_bool_array() {
query.bind(value.as_bool_ref_array())
} else if value.is_tiny_int_array() {
query.bind(value.as_tiny_int_ref_array())
} else if value.is_small_int_array() {
query.bind(value.as_small_int_ref_array())
} else if value.is_int_array() {
query.bind(value.as_int_ref_array())
} else if value.is_big_int_array() {
query.bind(value.as_big_int_ref_array())
} else if value.is_tiny_unsigned_array() {
query.bind(value.as_tiny_unsigned_ref_array())
} else if value.is_small_unsigned_array() {
query.bind(value.as_small_unsigned_ref_array())
} else if value.is_unsigned_array() {
query.bind(value.as_unsigned_ref_array())
} else if value.is_big_unsigned_array() {
query.bind(value.as_big_unsigned_ref_array())
} else if value.is_float_array() {
query.bind(value.as_float_ref_array())
} else if value.is_double_array() {
query.bind(value.as_double_ref_array())
} else if value.is_string_array() {
query.bind(value.as_string_ref_array())
} else if value.is_json_array() {
query.bind(value.as_json_ref_array())
} else if value.is_date_array() {
query.bind(value.as_date_ref_array())
} else if value.is_time_array() {
query.bind(value.as_time_ref_array())
} else if value.is_date_time_array() {
query.bind(value.as_date_time_ref_array())
} else if value.is_date_time_with_time_zone_array() {
query.bind(value.as_date_time_with_time_zone_ref_array())
} else if value.is_decimal_array() {
query.bind(value.as_decimal_ref_array())
} else if value.is_big_decimal_array() {
query.bind(value.as_big_decimal_ref_array())
} else if value.is_uuid_array() {
query.bind(value.as_uuid_ref_array())
} else {
unimplemented!();
}
} else {
unimplemented!();
}
Expand Down
182 changes: 182 additions & 0 deletions src/value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,188 @@ impl Value {
}
}

macro_rules! is_primitives {
( $is_ty: ident, $variant: ident ) => {
impl Value {
pub fn $is_ty(&self) -> bool {
return matches!(self, Self::$variant(_));
}
}
};
}

is_primitives!(is_bool, Bool);
is_primitives!(is_tiny_int, TinyInt);
is_primitives!(is_small_int, SmallInt);
is_primitives!(is_int, Int);
is_primitives!(is_big_int, BigInt);
is_primitives!(is_tiny_unsigned, TinyUnsigned);
is_primitives!(is_small_unsigned, SmallUnsigned);
is_primitives!(is_unsigned, Unsigned);
is_primitives!(is_big_unsigned, BigUnsigned);
is_primitives!(is_float, Float);
is_primitives!(is_double, Double);
is_primitives!(is_string, String);

macro_rules! bind_array_values {
( $is_ty: ident, $is_ty_array: ident, $as_ty_ref_array: ident, $ty: ty, $feature: literal ) => {
impl Value {
pub fn $is_ty_array(&self) -> bool {
#[cfg(feature = "postgres-array")]
return match self {
Self::Array(Some(values)) => !values.is_empty() && values[0].$is_ty(),
_ => false,
};
#[cfg(not(feature = "postgres-array"))]
return false;
}

#[cfg(all(feature = "postgres-array", feature = $feature))]
pub fn $as_ty_ref_array(&self) -> Option<Vec<$ty>> {
match self {
Self::Array(v) => v
.as_ref()
.map(|values| values.iter().map(|value| value.clone().unwrap()).collect()),
_ => panic!("not Value::Array"),
}
}
#[cfg(not(all(feature = "postgres-array", feature = $feature)))]
pub fn $as_ty_ref_array(&self) -> Option<&bool> {
panic!("not Value::Array")
}
}
};
}

bind_array_values!(
is_bool,
is_bool_array,
as_bool_ref_array,
bool,
"postgres-array"
);
bind_array_values!(
is_tiny_int,
is_tiny_int_array,
as_tiny_int_ref_array,
i8,
"postgres-array"
);
bind_array_values!(
is_small_int,
is_small_int_array,
as_small_int_ref_array,
i16,
"postgres-array"
);
bind_array_values!(
is_int,
is_int_array,
as_int_ref_array,
i32,
"postgres-array"
);
bind_array_values!(
is_big_int,
is_big_int_array,
as_big_int_ref_array,
i64,
"postgres-array"
);
bind_array_values!(
is_tiny_unsigned,
is_tiny_unsigned_array,
as_tiny_unsigned_ref_array,
u8,
"postgres-array"
);
bind_array_values!(
is_small_unsigned,
is_small_unsigned_array,
as_small_unsigned_ref_array,
u32, // Unwrap u16 as u32 here because SQLx PostgreSQL didn't support u16
"postgres-array"
);
bind_array_values!(
is_unsigned,
is_unsigned_array,
as_unsigned_ref_array,
u32,
"postgres-array"
);
bind_array_values!(
is_big_unsigned,
is_big_unsigned_array,
as_big_unsigned_ref_array,
i64, // Unwrap u64 as i64 here because SQLx PostgreSQL didn't support u64
"postgres-array"
);
bind_array_values!(
is_float,
is_float_array,
as_float_ref_array,
f32,
"postgres-array"
);
bind_array_values!(
is_double,
is_double_array,
as_double_ref_array,
f64,
"postgres-array"
);
bind_array_values!(
is_string,
is_string_array,
as_string_ref_array,
String,
"postgres-array"
);
bind_array_values!(is_json, is_json_array, as_json_ref_array, Json, "with-json");
bind_array_values!(
is_date,
is_date_array,
as_date_ref_array,
NaiveDate,
"with-chrono"
);
bind_array_values!(
is_time,
is_time_array,
as_time_ref_array,
NaiveTime,
"with-chrono"
);
bind_array_values!(
is_date_time,
is_date_time_array,
as_date_time_ref_array,
NaiveDateTime,
"with-chrono"
);
bind_array_values!(
is_date_time_with_time_zone,
is_date_time_with_time_zone_array,
as_date_time_with_time_zone_ref_array,
DateTime<FixedOffset>,
"with-chrono"
);
bind_array_values!(
is_decimal,
is_decimal_array,
as_decimal_ref_array,
Decimal,
"with-rust_decimal"
);
bind_array_values!(
is_big_decimal,
is_big_decimal_array,
as_big_decimal_ref_array,
BigDecimal,
"with-bigdecimal"
);
bind_array_values!(is_uuid, is_uuid_array, as_uuid_ref_array, Uuid, "with-uuid");

impl IntoIterator for ValueTuple {
type Item = Value;
type IntoIter = std::vec::IntoIter<Self::Item>;
Expand Down