Skip to content

Commit dd70a8b

Browse files
beneschbenesch
committed
Merge remote-tracking branch 'upstream/master' into integrate-upstream
2 parents 9c90862 + 65a68df commit dd70a8b

File tree

35 files changed

+261
-138
lines changed

35 files changed

+261
-138
lines changed

‎.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ jobs:
1717
name: rustfmt
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
- uses: sfackler/actions/rustup@master
2222
- uses: sfackler/actions/rustfmt@master
2323

2424
clippy:
2525
name: clippy
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2929
- uses: sfackler/actions/rustup@master
30-
- run: echo "::set-output name=version::$(rustc --version)"
30+
- run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
3131
id: rust-version
32-
- uses: actions/cache@v1
32+
- uses: actions/cache@v3
3333
with:
3434
path: ~/.cargo/registry/index
3535
key: index-${{ runner.os }}-${{ github.run_number }}
3636
restore-keys: |
3737
index-${{ runner.os }}-
3838
- run: cargo generate-lockfile
39-
- uses: actions/cache@v1
39+
- uses: actions/cache@v3
4040
with:
4141
path: ~/.cargo/registry/cache
4242
key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
4343
- run: cargo fetch
44-
- uses: actions/cache@v1
44+
- uses: actions/cache@v3
4545
with:
4646
path: target
4747
key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y
@@ -51,26 +51,26 @@ jobs:
5151
name: test
5252
runs-on: ubuntu-latest
5353
steps:
54-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v3
5555
- run: docker compose up -d
5656
- uses: sfackler/actions/rustup@master
5757
with:
58-
version: 1.62.0
59-
- run: echo "::set-output name=version::$(rustc --version)"
58+
version: 1.64.0
59+
- run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
6060
id: rust-version
61-
- uses: actions/cache@v1
61+
- uses: actions/cache@v3
6262
with:
6363
path: ~/.cargo/registry/index
6464
key: index-${{ runner.os }}-${{ github.run_number }}
6565
restore-keys: |
6666
index-${{ runner.os }}-
6767
- run: cargo generate-lockfile
68-
- uses: actions/cache@v1
68+
- uses: actions/cache@v3
6969
with:
7070
path: ~/.cargo/registry/cache
7171
key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
7272
- run: cargo fetch
73-
- uses: actions/cache@v1
73+
- uses: actions/cache@v3
7474
with:
7575
path: target
7676
key: test-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y

‎postgres-derive-test/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ where
1414
T: PartialEq + FromSqlOwned + ToSql + Sync,
1515
S: fmt::Display,
1616
{
17-
for &(ref val, ref repr) in checks.iter() {
17+
for (val, repr) in checks.iter() {
1818
let stmt = conn
1919
.prepare(&format!("SELECT {}::{}", *repr, sql_type))
2020
.unwrap();
@@ -38,7 +38,7 @@ pub fn test_type_asymmetric<T, F, S, C>(
3838
S: fmt::Display,
3939
C: Fn(&T, &F) -> bool,
4040
{
41-
for &(ref val, ref repr) in checks.iter() {
41+
for (val, repr) in checks.iter() {
4242
let stmt = conn
4343
.prepare(&format!("SELECT {}::{}", *repr, sql_type))
4444
.unwrap();

‎postgres-derive/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## v0.4.4 - 2023-03-27
4+
5+
### Changed
6+
7+
* Upgraded `syn`.
8+
39
## v0.4.3 - 2022-09-07
410

511
### Added

‎postgres-derive/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "postgres-derive"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
authors = ["Steven Fackler <sfackler@palantir.com>"]
55
license = "MIT/Apache-2.0"
66
edition = "2018"
@@ -12,6 +12,6 @@ proc-macro = true
1212
test = false
1313

1414
[dependencies]
15-
syn = "1.0"
15+
syn = "2.0"
1616
proc-macro2 = "1.0"
1717
quote = "1.0"

‎postgres-derive/src/fromsql.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use quote::{format_ident, quote};
33
use std::iter;
44
use syn::{
55
punctuated::Punctuated, token, AngleBracketedGenericArguments, Data, DataStruct, DeriveInput,
6-
Error, Fields, GenericArgument, GenericParam, Generics, Ident, Lifetime, LifetimeDef,
7-
PathArguments, PathSegment,
6+
Error, Fields, GenericArgument, GenericParam, Generics, Ident, Lifetime, PathArguments,
7+
PathSegment,
88
};
9-
use syn::{TraitBound, TraitBoundModifier, TypeParamBound};
9+
use syn::{LifetimeParam, TraitBound, TraitBoundModifier, TypeParamBound};
1010

1111
use crate::accepts;
1212
use crate::composites::Field;
@@ -96,9 +96,9 @@ pub fn expand_derive_fromsql(input: DeriveInput) -> Result<TokenStream, Error> {
9696
let (impl_generics, _, _) = generics.split_for_impl();
9797
let (_, ty_generics, where_clause) = input.generics.split_for_impl();
9898
let out = quote! {
99-
impl#impl_generics postgres_types::FromSql<#lifetime> for #ident#ty_generics #where_clause {
99+
impl #impl_generics postgres_types::FromSql<#lifetime> for #ident #ty_generics #where_clause {
100100
fn from_sql(_type: &postgres_types::Type, buf: &#lifetime [u8])
101-
-> std::result::Result<#ident#ty_generics,
101+
-> std::result::Result<#ident #ty_generics,
102102
std::boxed::Box<dyn std::error::Error +
103103
std::marker::Sync +
104104
std::marker::Send>> {
@@ -217,7 +217,7 @@ fn build_generics(source: &Generics) -> (Generics, Lifetime) {
217217
let mut out = append_generic_bound(source.to_owned(), &new_fromsql_bound(&lifetime));
218218
out.params.insert(
219219
0,
220-
GenericParam::Lifetime(LifetimeDef::new(lifetime.to_owned())),
220+
GenericParam::Lifetime(LifetimeParam::new(lifetime.to_owned())),
221221
);
222222

223223
(out, lifetime)

‎postgres-derive/src/overrides.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
use syn::{Attribute, Error, Lit, Meta, NestedMeta};
1+
use syn::punctuated::Punctuated;
2+
use syn::{Attribute, Error, Expr, ExprLit, Lit, Meta, Token};
23

34
pub struct Overrides {
45
pub name: Option<String>,
@@ -13,34 +14,36 @@ impl Overrides {
1314
};
1415

1516
for attr in attrs {
16-
let attr = attr.parse_meta()?;
17-
1817
if !attr.path().is_ident("postgres") {
1918
continue;
2019
}
2120

22-
let list = match attr {
21+
let list = match &attr.meta {
2322
Meta::List(ref list) => list,
2423
bad => return Err(Error::new_spanned(bad, "expected a #[postgres(...)]")),
2524
};
2625

27-
for item in &list.nested {
26+
let nested = list.parse_args_with(Punctuated::<Meta, Token![,]>::parse_terminated)?;
27+
28+
for item in nested {
2829
match item {
29-
NestedMeta::Meta(Meta::NameValue(meta)) => {
30+
Meta::NameValue(meta) => {
3031
if !meta.path.is_ident("name") {
3132
return Err(Error::new_spanned(&meta.path, "unknown override"));
3233
}
3334

34-
let value = match &meta.lit {
35-
Lit::Str(s) => s.value(),
35+
let value = match &meta.value {
36+
Expr::Lit(ExprLit {
37+
lit: Lit::Str(lit), ..
38+
}) => lit.value(),
3639
bad => {
3740
return Err(Error::new_spanned(bad, "expected a string literal"))
3841
}
3942
};
4043

4144
overrides.name = Some(value);
4245
}
43-
NestedMeta::Meta(Meta::Path(ref path)) => {
46+
Meta::Path(path) => {
4447
if !path.is_ident("transparent") {
4548
return Err(Error::new_spanned(path, "unknown override"));
4649
}

‎postgres-protocol/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Change Log
22

3+
## v0.6.5 - 2023-03-27
4+
5+
### Added
6+
7+
* Added `message::frontend::flush`.
8+
* Added `DataRowBody::buffer_bytes`.
9+
10+
### Changed
11+
12+
* Upgraded `base64`.
13+
314
## v0.6.4 - 2022-04-03
415

516
### Added

‎postgres-protocol/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "postgres-protocol"
3-
version = "0.6.4"
3+
version = "0.6.5"
44
authors = ["Steven Fackler <sfackler@gmail.com>"]
55
edition = "2018"
66
description = "Low level Postgres protocol APIs"
@@ -9,7 +9,7 @@ repository = "https://github.com/sfackler/rust-postgres"
99
readme = "../README.md"
1010

1111
[dependencies]
12-
base64 = "0.13"
12+
base64 = "0.21"
1313
byteorder = "1.0"
1414
bytes = "1.0"
1515
fallible-iterator = "0.2"

‎postgres-protocol/src/authentication/sasl.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
//! SASL-based authentication support.
22
3+
use base64::display::Base64Display;
4+
use base64::engine::general_purpose::STANDARD;
5+
use base64::Engine;
36
use hmac::{Hmac, Mac};
47
use rand::{self, Rng};
58
use sha2::digest::FixedOutput;
@@ -189,7 +192,7 @@ impl ScramSha256 {
189192
return Err(io::Error::new(io::ErrorKind::InvalidInput, "invalid nonce"));
190193
}
191194

192-
let salt = match base64::decode(parsed.salt) {
195+
let salt = match STANDARD.decode(parsed.salt) {
193196
Ok(salt) => salt,
194197
Err(e) => return Err(io::Error::new(io::ErrorKind::InvalidInput, e)),
195198
};
@@ -208,7 +211,7 @@ impl ScramSha256 {
208211
let mut cbind_input = vec![];
209212
cbind_input.extend(channel_binding.gs2_header().as_bytes());
210213
cbind_input.extend(channel_binding.cbind_data());
211-
let cbind_input = base64::encode(&cbind_input);
214+
let cbind_input = STANDARD.encode(&cbind_input);
212215

213216
self.message.clear();
214217
write!(&mut self.message, "c={},r={}", cbind_input, parsed.nonce).unwrap();
@@ -225,7 +228,12 @@ impl ScramSha256 {
225228
*proof ^= signature;
226229
}
227230

228-
write!(&mut self.message, ",p={}", base64::encode(&*client_proof)).unwrap();
231+
write!(
232+
&mut self.message,
233+
",p={}",
234+
Base64Display::new(&client_proof, &STANDARD)
235+
)
236+
.unwrap();
229237

230238
self.state = State::Finish {
231239
salted_password,
@@ -262,7 +270,7 @@ impl ScramSha256 {
262270
ServerFinalMessage::Verifier(verifier) => verifier,
263271
};
264272

265-
let verifier = match base64::decode(verifier) {
273+
let verifier = match STANDARD.decode(verifier) {
266274
Ok(verifier) => verifier,
267275
Err(e) => return Err(io::Error::new(io::ErrorKind::InvalidInput, e)),
268276
};
@@ -351,7 +359,7 @@ impl<'a> Parser<'a> {
351359
}
352360

353361
fn posit_number(&mut self) -> io::Result<u32> {
354-
let n = self.take_while(|c| matches!(c, '0'..='9'))?;
362+
let n = self.take_while(|c| c.is_ascii_digit())?;
355363
n.parse()
356364
.map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))
357365
}

‎postgres-protocol/src/message/backend.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,7 @@ impl CopyBothResponseBody {
638638
}
639639
}
640640

641+
#[derive(Debug)]
641642
pub struct DataRowBody {
642643
storage: Bytes,
643644
len: u16,
@@ -657,6 +658,11 @@ impl DataRowBody {
657658
pub fn buffer(&self) -> &[u8] {
658659
&self.storage
659660
}
661+
662+
#[inline]
663+
pub fn buffer_bytes(&self) -> &Bytes {
664+
&self.storage
665+
}
660666
}
661667

662668
pub struct DataRowRanges<'a> {
@@ -695,7 +701,7 @@ impl<'a> FallibleIterator for DataRowRanges<'a> {
695701
));
696702
}
697703
let base = self.len - self.buf.len();
698-
self.buf = &self.buf[len as usize..];
704+
self.buf = &self.buf[len..];
699705
Ok(Some(Some(base..base + len)))
700706
}
701707
}

‎postgres-protocol/src/message/frontend.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,12 @@ where
271271
})
272272
}
273273

274+
#[inline]
275+
pub fn flush(buf: &mut BytesMut) {
276+
buf.put_u8(b'H');
277+
write_body(buf, |_| Ok::<(), io::Error>(())).unwrap();
278+
}
279+
274280
#[inline]
275281
pub fn sync(buf: &mut BytesMut) {
276282
buf.put_u8(b'S');

‎postgres-protocol/src/password/mod.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
//! end up in logs pg_stat displays, etc.
88
99
use crate::authentication::sasl;
10+
use base64::display::Base64Display;
11+
use base64::engine::general_purpose::STANDARD;
1012
use hmac::{Hmac, Mac};
1113
use md5::Md5;
1214
use rand::RngCore;
@@ -80,9 +82,9 @@ pub(crate) fn scram_sha_256_salt(password: &[u8], salt: [u8; SCRAM_DEFAULT_SALT_
8082
format!(
8183
"SCRAM-SHA-256${}:{}${}:{}",
8284
SCRAM_DEFAULT_ITERATIONS,
83-
base64::encode(salt),
84-
base64::encode(stored_key),
85-
base64::encode(server_key)
85+
Base64Display::new(&salt, &STANDARD),
86+
Base64Display::new(&stored_key, &STANDARD),
87+
Base64Display::new(&server_key, &STANDARD)
8688
)
8789
}
8890

‎postgres-types/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## v0.2.5 - 2023-03-27
4+
5+
## Added
6+
7+
* Added support for multi-range types.
8+
39
## v0.2.4 - 2022-08-20
410

511
## Added

‎postgres-types/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "postgres-types"
3-
version = "0.2.4"
3+
version = "0.2.5"
44
authors = ["Steven Fackler <sfackler@gmail.com>"]
55
edition = "2018"
66
license = "MIT/Apache-2.0"

‎postgres/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log
22

3+
## v0.19.5 - 2023-03-27
4+
5+
## Added
6+
7+
* Added `keepalives_interval` and `keepalives_retries` config options.
8+
* Added the `tcp_user_timeout` config option.
9+
* Added `RowIter::rows_affected`.
10+
11+
## Changed
12+
13+
* Passing an incorrect number of parameters to a query method now returns an error instead of panicking.
14+
315
## v0.19.4 - 2022-08-21
416

517
## Added

0 commit comments

Comments
 (0)