Skip to content

Commit 1698c3b

Browse files
Merge branch 'main' into smol+async-global-executor-1.80-dev
2 parents c7fa793 + 580b8df commit 1698c3b

File tree

19 files changed

+295
-9
lines changed

19 files changed

+295
-9
lines changed

Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ _unstable-all-types = [
6767
"json",
6868
"time",
6969
"chrono",
70+
"ipnet",
7071
"ipnetwork",
7172
"mac_address",
7273
"uuid",
@@ -121,11 +122,12 @@ sqlite-unbundled = ["_sqlite", "sqlx-sqlite/unbundled", "sqlx-macros?/sqlite-unb
121122
sqlite-preupdate-hook = ["sqlx-sqlite/preupdate-hook"]
122123

123124
# types
124-
json = ["sqlx-macros?/json", "sqlx-mysql?/json", "sqlx-postgres?/json", "sqlx-sqlite?/json"]
125+
json = ["sqlx-core/json", "sqlx-macros?/json", "sqlx-mysql?/json", "sqlx-postgres?/json", "sqlx-sqlite?/json"]
125126

126127
bigdecimal = ["sqlx-core/bigdecimal", "sqlx-macros?/bigdecimal", "sqlx-mysql?/bigdecimal", "sqlx-postgres?/bigdecimal"]
127128
bit-vec = ["sqlx-core/bit-vec", "sqlx-macros?/bit-vec", "sqlx-postgres?/bit-vec"]
128129
chrono = ["sqlx-core/chrono", "sqlx-macros?/chrono", "sqlx-mysql?/chrono", "sqlx-postgres?/chrono", "sqlx-sqlite?/chrono"]
130+
ipnet = ["sqlx-core/ipnet", "sqlx-macros?/ipnet", "sqlx-postgres?/ipnet"]
129131
ipnetwork = ["sqlx-core/ipnetwork", "sqlx-macros?/ipnetwork", "sqlx-postgres?/ipnetwork"]
130132
mac_address = ["sqlx-core/mac_address", "sqlx-macros?/mac_address", "sqlx-postgres?/mac_address"]
131133
rust_decimal = ["sqlx-core/rust_decimal", "sqlx-macros?/rust_decimal", "sqlx-mysql?/rust_decimal", "sqlx-postgres?/rust_decimal"]
@@ -153,6 +155,7 @@ sqlx = { version = "=0.8.3", path = ".", default-features = false }
153155
bigdecimal = "0.4.0"
154156
bit-vec = "0.6.3"
155157
chrono = { version = "0.4.34", default-features = false, features = ["std", "clock"] }
158+
ipnet = "2.3.0"
156159
ipnetwork = "0.20.0"
157160
mac_address = "1.1.5"
158161
rust_decimal = { version = "1.26.1", default-features = false, features = ["std"] }

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ be removed in the future.
220220

221221
- `rust_decimal`: Add support for `NUMERIC` using the `rust_decimal` crate.
222222

223+
- `ipnet`: Add support for `INET` and `CIDR` (in postgres) using the `ipnet` crate.
224+
223225
- `ipnetwork`: Add support for `INET` and `CIDR` (in postgres) using the `ipnetwork` crate.
224226

225227
- `json`: Add support for `JSON` and `JSONB` (in postgres) using the `serde_json` crate.

sqlx-core/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ bit-vec = { workspace = true, optional = true }
5757
bigdecimal = { workspace = true, optional = true }
5858
rust_decimal = { workspace = true, optional = true }
5959
time = { workspace = true, optional = true }
60+
ipnet = { workspace = true, optional = true }
6061
ipnetwork = { workspace = true, optional = true }
6162
mac_address = { workspace = true, optional = true }
6263
uuid = { workspace = true, optional = true }

sqlx-core/src/types/mod.rs

+7
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@ pub use bigdecimal::BigDecimal;
6767
#[doc(no_inline)]
6868
pub use rust_decimal::Decimal;
6969

70+
#[cfg(feature = "ipnet")]
71+
#[cfg_attr(docsrs, doc(cfg(feature = "ipnet")))]
72+
pub mod ipnet {
73+
#[doc(no_inline)]
74+
pub use ipnet::{IpNet, Ipv4Net, Ipv6Net};
75+
}
76+
7077
#[cfg(feature = "ipnetwork")]
7178
#[cfg_attr(docsrs, doc(cfg(feature = "ipnetwork")))]
7279
pub mod ipnetwork {

sqlx-macros-core/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ json = ["sqlx-core/json", "sqlx-mysql?/json", "sqlx-postgres?/json", "sqlx-sqlit
4040
bigdecimal = ["sqlx-core/bigdecimal", "sqlx-mysql?/bigdecimal", "sqlx-postgres?/bigdecimal"]
4141
bit-vec = ["sqlx-core/bit-vec", "sqlx-postgres?/bit-vec"]
4242
chrono = ["sqlx-core/chrono", "sqlx-mysql?/chrono", "sqlx-postgres?/chrono", "sqlx-sqlite?/chrono"]
43+
ipnet = ["sqlx-core/ipnet", "sqlx-postgres?/ipnet"]
4344
ipnetwork = ["sqlx-core/ipnetwork", "sqlx-postgres?/ipnetwork"]
4445
mac_address = ["sqlx-core/mac_address", "sqlx-postgres?/mac_address"]
4546
rust_decimal = ["sqlx-core/rust_decimal", "sqlx-mysql?/rust_decimal", "sqlx-postgres?/rust_decimal"]

sqlx-macros/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ sqlite-unbundled = ["sqlx-macros-core/sqlite-unbundled"]
3939
bigdecimal = ["sqlx-macros-core/bigdecimal"]
4040
bit-vec = ["sqlx-macros-core/bit-vec"]
4141
chrono = ["sqlx-macros-core/chrono"]
42+
ipnet = ["sqlx-macros-core/ipnet"]
4243
ipnetwork = ["sqlx-macros-core/ipnetwork"]
4344
mac_address = ["sqlx-macros-core/mac_address"]
4445
rust_decimal = ["sqlx-macros-core/rust_decimal"]

sqlx-mysql/src/protocol/text/row.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@ impl<'de> ProtocolDecode<'de, &'de [MySqlColumn]> for TextRow {
1616

1717
let mut values = Vec::with_capacity(columns.len());
1818

19-
for _ in columns {
19+
for c in columns {
2020
if buf[0] == 0xfb {
2121
// NULL is sent as 0xfb
2222
values.push(None);
2323
buf.advance(1);
2424
} else {
2525
let size = buf.get_uint_lenenc();
26+
if (buf.remaining() as u64) < size {
27+
return Err(err_protocol!(
28+
"buffer exhausted when reading data for column {:?}; decoded length is {}, but only {} bytes remain in buffer. Malformed packet or protocol error?",
29+
c,
30+
size,
31+
buf.remaining()));
32+
}
2633
let size = usize::try_from(size)
2734
.map_err(|_| err_protocol!("TextRow length out of range: {size}"))?;
2835

sqlx-postgres/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ offline = ["sqlx-core/offline"]
1919
bigdecimal = ["dep:bigdecimal", "dep:num-bigint", "sqlx-core/bigdecimal"]
2020
bit-vec = ["dep:bit-vec", "sqlx-core/bit-vec"]
2121
chrono = ["dep:chrono", "sqlx-core/chrono"]
22+
ipnet = ["dep:ipnet", "sqlx-core/ipnet"]
2223
ipnetwork = ["dep:ipnetwork", "sqlx-core/ipnetwork"]
2324
mac_address = ["dep:mac_address", "sqlx-core/mac_address"]
2425
rust_decimal = ["dep:rust_decimal", "rust_decimal/maths", "sqlx-core/rust_decimal"]
@@ -43,6 +44,7 @@ sha2 = { version = "0.10.0", default-features = false }
4344
bigdecimal = { workspace = true, optional = true }
4445
bit-vec = { workspace = true, optional = true }
4546
chrono = { workspace = true, optional = true }
47+
ipnet = { workspace = true, optional = true }
4648
ipnetwork = { workspace = true, optional = true }
4749
mac_address = { workspace = true, optional = true }
4850
rust_decimal = { workspace = true, optional = true }

sqlx-postgres/src/type_checking.rs

+6
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ impl_type_checking!(
8888
#[cfg(feature = "ipnetwork")]
8989
sqlx::types::ipnetwork::IpNetwork,
9090

91+
#[cfg(feature = "ipnet")]
92+
sqlx::types::ipnet::IpNet,
93+
9194
#[cfg(feature = "mac_address")]
9295
sqlx::types::mac_address::MacAddress,
9396

@@ -149,6 +152,9 @@ impl_type_checking!(
149152
#[cfg(feature = "ipnetwork")]
150153
Vec<sqlx::types::ipnetwork::IpNetwork> | &[sqlx::types::ipnetwork::IpNetwork],
151154

155+
#[cfg(feature = "ipnet")]
156+
Vec<sqlx::types::ipnet::IpNet> | &[sqlx::types::ipnet::IpNet],
157+
152158
#[cfg(feature = "mac_address")]
153159
Vec<sqlx::types::mac_address::MacAddress> | &[sqlx::types::mac_address::MacAddress],
154160

sqlx-postgres/src/types/geometry/point.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl FromStr for PgPoint {
7777
.ok_or_else(|| format!("error decoding POINT: could not get x and y from {}", s))?;
7878

7979
let x = parse_float_from_str(x_str, "error decoding POINT: could not get x")?;
80-
let y = parse_float_from_str(y_str, "error decoding POINT: could not get x")?;
80+
let y = parse_float_from_str(y_str, "error decoding POINT: could not get y")?;
8181

8282
Ok(PgPoint { x, y })
8383
}
+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
use std::net::IpAddr;
2+
3+
use ipnet::IpNet;
4+
5+
use crate::decode::Decode;
6+
use crate::encode::{Encode, IsNull};
7+
use crate::error::BoxDynError;
8+
use crate::types::Type;
9+
use crate::{PgArgumentBuffer, PgHasArrayType, PgTypeInfo, PgValueRef, Postgres};
10+
11+
impl Type<Postgres> for IpAddr
12+
where
13+
IpNet: Type<Postgres>,
14+
{
15+
fn type_info() -> PgTypeInfo {
16+
IpNet::type_info()
17+
}
18+
19+
fn compatible(ty: &PgTypeInfo) -> bool {
20+
IpNet::compatible(ty)
21+
}
22+
}
23+
24+
impl PgHasArrayType for IpAddr {
25+
fn array_type_info() -> PgTypeInfo {
26+
<IpNet as PgHasArrayType>::array_type_info()
27+
}
28+
29+
fn array_compatible(ty: &PgTypeInfo) -> bool {
30+
<IpNet as PgHasArrayType>::array_compatible(ty)
31+
}
32+
}
33+
34+
impl<'db> Encode<'db, Postgres> for IpAddr
35+
where
36+
IpNet: Encode<'db, Postgres>,
37+
{
38+
fn encode_by_ref(&self, buf: &mut PgArgumentBuffer) -> Result<IsNull, BoxDynError> {
39+
IpNet::from(*self).encode_by_ref(buf)
40+
}
41+
42+
fn size_hint(&self) -> usize {
43+
IpNet::from(*self).size_hint()
44+
}
45+
}
46+
47+
impl<'db> Decode<'db, Postgres> for IpAddr
48+
where
49+
IpNet: Decode<'db, Postgres>,
50+
{
51+
fn decode(value: PgValueRef<'db>) -> Result<Self, BoxDynError> {
52+
let ipnet = IpNet::decode(value)?;
53+
54+
if matches!(ipnet, IpNet::V4(net) if net.prefix_len() != 32)
55+
|| matches!(ipnet, IpNet::V6(net) if net.prefix_len() != 128)
56+
{
57+
Err("lossy decode from inet/cidr")?
58+
}
59+
60+
Ok(ipnet.addr())
61+
}
62+
}
+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
2+
3+
#[cfg(feature = "ipnet")]
4+
use ipnet::{IpNet, Ipv4Net, Ipv6Net};
5+
6+
use crate::decode::Decode;
7+
use crate::encode::{Encode, IsNull};
8+
use crate::error::BoxDynError;
9+
use crate::types::Type;
10+
use crate::{PgArgumentBuffer, PgHasArrayType, PgTypeInfo, PgValueFormat, PgValueRef, Postgres};
11+
12+
// https://github.com/postgres/postgres/blob/574925bfd0a8175f6e161936ea11d9695677ba09/src/include/utils/inet.h#L39
13+
14+
// Technically this is a magic number here but it doesn't make sense to drag in the whole of `libc`
15+
// just for one constant.
16+
const PGSQL_AF_INET: u8 = 2; // AF_INET
17+
const PGSQL_AF_INET6: u8 = PGSQL_AF_INET + 1;
18+
19+
impl Type<Postgres> for IpNet {
20+
fn type_info() -> PgTypeInfo {
21+
PgTypeInfo::INET
22+
}
23+
24+
fn compatible(ty: &PgTypeInfo) -> bool {
25+
*ty == PgTypeInfo::CIDR || *ty == PgTypeInfo::INET
26+
}
27+
}
28+
29+
impl PgHasArrayType for IpNet {
30+
fn array_type_info() -> PgTypeInfo {
31+
PgTypeInfo::INET_ARRAY
32+
}
33+
34+
fn array_compatible(ty: &PgTypeInfo) -> bool {
35+
*ty == PgTypeInfo::CIDR_ARRAY || *ty == PgTypeInfo::INET_ARRAY
36+
}
37+
}
38+
39+
impl Encode<'_, Postgres> for IpNet {
40+
fn encode_by_ref(&self, buf: &mut PgArgumentBuffer) -> Result<IsNull, BoxDynError> {
41+
// https://github.com/postgres/postgres/blob/574925bfd0a8175f6e161936ea11d9695677ba09/src/backend/utils/adt/network.c#L293
42+
// https://github.com/postgres/postgres/blob/574925bfd0a8175f6e161936ea11d9695677ba09/src/backend/utils/adt/network.c#L271
43+
44+
match self {
45+
IpNet::V4(net) => {
46+
buf.push(PGSQL_AF_INET); // ip_family
47+
buf.push(net.prefix_len()); // ip_bits
48+
buf.push(0); // is_cidr
49+
buf.push(4); // nb (number of bytes)
50+
buf.extend_from_slice(&net.addr().octets()) // address
51+
}
52+
53+
IpNet::V6(net) => {
54+
buf.push(PGSQL_AF_INET6); // ip_family
55+
buf.push(net.prefix_len()); // ip_bits
56+
buf.push(0); // is_cidr
57+
buf.push(16); // nb (number of bytes)
58+
buf.extend_from_slice(&net.addr().octets()); // address
59+
}
60+
}
61+
62+
Ok(IsNull::No)
63+
}
64+
65+
fn size_hint(&self) -> usize {
66+
match self {
67+
IpNet::V4(_) => 8,
68+
IpNet::V6(_) => 20,
69+
}
70+
}
71+
}
72+
73+
impl Decode<'_, Postgres> for IpNet {
74+
fn decode(value: PgValueRef<'_>) -> Result<Self, BoxDynError> {
75+
let bytes = match value.format() {
76+
PgValueFormat::Binary => value.as_bytes()?,
77+
PgValueFormat::Text => {
78+
let s = value.as_str()?;
79+
println!("{s}");
80+
if s.contains('/') {
81+
return Ok(s.parse()?);
82+
}
83+
// IpNet::from_str doesn't handle conversion from IpAddr to IpNet
84+
let addr: IpAddr = s.parse()?;
85+
return Ok(addr.into());
86+
}
87+
};
88+
89+
if bytes.len() >= 8 {
90+
let family = bytes[0];
91+
let prefix = bytes[1];
92+
let _is_cidr = bytes[2] != 0;
93+
let len = bytes[3];
94+
95+
match family {
96+
PGSQL_AF_INET => {
97+
if bytes.len() == 8 && len == 4 {
98+
let inet = Ipv4Net::new(
99+
Ipv4Addr::new(bytes[4], bytes[5], bytes[6], bytes[7]),
100+
prefix,
101+
)?;
102+
103+
return Ok(IpNet::V4(inet));
104+
}
105+
}
106+
107+
PGSQL_AF_INET6 => {
108+
if bytes.len() == 20 && len == 16 {
109+
let inet = Ipv6Net::new(
110+
Ipv6Addr::from([
111+
bytes[4], bytes[5], bytes[6], bytes[7], bytes[8], bytes[9],
112+
bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15],
113+
bytes[16], bytes[17], bytes[18], bytes[19],
114+
]),
115+
prefix,
116+
)?;
117+
118+
return Ok(IpNet::V6(inet));
119+
}
120+
}
121+
122+
_ => {
123+
return Err(format!("unknown ip family {family}").into());
124+
}
125+
}
126+
}
127+
128+
Err("invalid data received when expecting an INET".into())
129+
}
130+
}

sqlx-postgres/src/types/ipnet/mod.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Prefer `ipnetwork` over `ipnet` because it was implemented first (want to avoid breaking change).
2+
#[cfg(not(feature = "ipnetwork"))]
3+
mod ipaddr;
4+
5+
// Parent module is named after the `ipnet` crate, this is named after the `IpNet` type.
6+
#[allow(clippy::module_inception)]
7+
mod ipnet;
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mod ipaddr;
2+
3+
// Parent module is named after the `ipnetwork` crate, this is named after the `IpNetwork` type.
4+
#[allow(clippy::module_inception)]
5+
mod ipnetwork;

sqlx-postgres/src/types/mod.rs

+15-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
//!
8888
//! ### [`ipnetwork`](https://crates.io/crates/ipnetwork)
8989
//!
90-
//! Requires the `ipnetwork` Cargo feature flag.
90+
//! Requires the `ipnetwork` Cargo feature flag (takes precedence over `ipnet` if both are used).
9191
//!
9292
//! | Rust type | Postgres type(s) |
9393
//! |---------------------------------------|------------------------------------------------------|
@@ -100,6 +100,17 @@
100100
//!
101101
//! `IpNetwork` does not have this limitation.
102102
//!
103+
//! ### [`ipnet`](https://crates.io/crates/ipnet)
104+
//!
105+
//! Requires the `ipnet` Cargo feature flag.
106+
//!
107+
//! | Rust type | Postgres type(s) |
108+
//! |---------------------------------------|------------------------------------------------------|
109+
//! | `ipnet::IpNet` | INET, CIDR |
110+
//! | `std::net::IpAddr` | INET, CIDR |
111+
//!
112+
//! The same `IpAddr` limitation for smaller network prefixes applies as with `ipnet`.
113+
//!
103114
//! ### [`mac_address`](https://crates.io/crates/mac_address)
104115
//!
105116
//! Requires the `mac_address` Cargo feature flag.
@@ -248,11 +259,11 @@ mod time;
248259
#[cfg(feature = "uuid")]
249260
mod uuid;
250261

251-
#[cfg(feature = "ipnetwork")]
252-
mod ipnetwork;
262+
#[cfg(feature = "ipnet")]
263+
mod ipnet;
253264

254265
#[cfg(feature = "ipnetwork")]
255-
mod ipaddr;
266+
mod ipnetwork;
256267

257268
#[cfg(feature = "mac_address")]
258269
mod mac_address;

0 commit comments

Comments
 (0)