Merge upstream to pick up new fixes and features

.github/workflows/ci.yml

@@ -17,90 +17,95 @@ jobs:
     name: rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: sfackler/actions/rustup@master
-      - uses: sfackler/actions/rustfmt@master
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+      - run: cargo fmt --all -- --check
 
   clippy:
     name: clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: sfackler/actions/rustup@master
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cargo/registry/index
           key: index-${{ runner.os }}-${{ github.run_number }}
           restore-keys: |
             index-${{ runner.os }}-
       - run: cargo generate-lockfile
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cargo/registry/cache
           key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
       - run: cargo fetch
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: target
-          key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y
+          key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
       - run: cargo clippy --all --all-targets
 
   check-wasm32:
     name: check-wasm32
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: sfackler/actions/rustup@master
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-unknown-unknown
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
-      - run: rustup target add wasm32-unknown-unknown
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cargo/registry/index
           key: index-${{ runner.os }}-${{ github.run_number }}
           restore-keys: |
             index-${{ runner.os }}-
       - run: cargo generate-lockfile
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cargo/registry/cache
           key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
       - run: cargo fetch
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: target
           key: check-wasm32-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
       - run: cargo check --target wasm32-unknown-unknown --manifest-path tokio-postgres/Cargo.toml --no-default-features --features js
+        env:
+          RUSTFLAGS: --cfg getrandom_backend="wasm_js"
 
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - run: docker compose up -d
-      - uses: sfackler/actions/rustup@master
-        with:
-          version: 1.77.0
+      - uses: dtolnay/rust-toolchain@1.81.0
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cargo/registry/index
           key: index-${{ runner.os }}-${{ github.run_number }}
           restore-keys: |
             index-${{ runner.os }}-
       - run: cargo generate-lockfile
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.cargo/registry/cache
           key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
       - run: cargo fetch
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: target
-          key: test-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y
+          key: test-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
       - run: cargo test --all
       - run: cargo test --manifest-path tokio-postgres/Cargo.toml --no-default-features
       - run: cargo test --manifest-path tokio-postgres/Cargo.toml --all-features

codegen/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 
 [dependencies]
-phf_codegen = "0.11"
+phf_codegen = "0.13"
 regex = "1.0"
 marksman_escape = "0.1"
 linked-hash-map = "0.5"

codegen/src/sqlstate.rs

@@ -72,7 +72,6 @@ fn make_code(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<Fi
             file,
             r#"
             Inner::E{code} => "{code}","#,
-            code = code,
         )
         .unwrap();
     }
@@ -97,8 +96,6 @@ fn make_consts(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<
     /// {code}
     pub const {name}: SqlState = SqlState(Inner::E{code});
 "#,
-                name = name,
-                code = code,
             )
             .unwrap();
         }
@@ -121,8 +118,7 @@ enum Inner {{"#,
         write!(
             file,
             r#"
-    E{},"#,
-            code,
+    E{code},"#,
         )
         .unwrap();
     }
@@ -139,7 +135,7 @@ enum Inner {{"#,
 fn make_map(codes: &LinkedHashMap<String, Vec<String>>, file: &mut BufWriter<File>) {
     let mut builder = phf_codegen::Map::new();
     for (code, names) in codes {
-        builder.entry(&**code, &format!("SqlState::{}", &names[0]));
+        builder.entry(&**code, format!("SqlState::{}", &names[0]));
     }
     write!(
         file,

codegen/src/type_gen.rs

@@ -237,18 +237,18 @@ fn parse_types() -> BTreeMap<u32, Type> {
         let doc_name = array_re.replace(&name, "$1[]").to_ascii_uppercase();
         let mut doc = doc_name.clone();
         if let Some(descr) = raw_type.get("descr") {
-            write!(doc, " - {}", descr).unwrap();
+            write!(doc, " - {descr}").unwrap();
         }
         let doc = Escape::new(doc.as_bytes().iter().cloned()).collect();
         let doc = String::from_utf8(doc).unwrap();
 
         if let Some(array_type_oid) = raw_type.get("array_type_oid") {
             let array_type_oid = array_type_oid.parse::<u32>().unwrap();
 
-            let name = format!("_{}", name);
-            let variant = format!("{}Array", variant);
-            let doc = format!("{}&#91;&#93;", doc_name);
-            let ident = format!("{}_ARRAY", ident);
+            let name = format!("_{name}");
+            let variant = format!("{variant}Array");
+            let doc = format!("{doc_name}&#91;&#93;");
+            let ident = format!("{ident}_ARRAY");
 
             let type_ = Type {
                 name,

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   postgres:
-    image: postgres:14
+    image: docker.io/postgres:18
     ports:
       - 5433:5433
     volumes:

postgres-derive-test/Cargo.toml

@@ -2,7 +2,7 @@
 name = "postgres-derive-test"
 version = "0.1.0"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 trybuild = "1.0"

postgres-derive-test/src/domains.rs

@@ -119,3 +119,36 @@ fn domain_in_composite() {
         )],
     );
 }
+
+#[test]
+fn composite_in_domain_in_composite() {
+    #[derive(FromSql, ToSql, Debug, PartialEq)]
+    #[postgres(name = "leaf_composite")]
+    struct LeafComposite {
+        prim: i32,
+    }
+
+    #[derive(FromSql, ToSql, Debug, PartialEq)]
+    #[postgres(name = "domain")]
+    struct Domain(LeafComposite);
+
+    #[derive(FromSql, ToSql, Debug, PartialEq)]
+    #[postgres(name = "root_composite")]
+    struct RootComposite {
+        domain: Domain,
+    }
+
+    let mut conn = Client::connect("user=postgres host=localhost port=5433", NoTls).unwrap();
+    conn.batch_execute("CREATE TYPE leaf_composite AS (prim integer); CREATE DOMAIN domain AS leaf_composite; CREATE TYPE root_composite AS (domain domain);").unwrap();
+
+    test_type(
+        &mut conn,
+        "root_composite",
+        &[(
+            RootComposite {
+                domain: Domain(LeafComposite { prim: 1 }),
+            },
+            "ROW(ROW(1))",
+        )],
+    );
+}

postgres-derive-test/src/lib.rs

@@ -21,7 +21,7 @@ where
         let result = conn.query_one(&stmt, &[]).unwrap().get(0);
         assert_eq!(val, &result);
 
-        let stmt = conn.prepare(&format!("SELECT $1::{}", sql_type)).unwrap();
+        let stmt = conn.prepare(&format!("SELECT $1::{sql_type}")).unwrap();
         let result = conn.query_one(&stmt, &[val]).unwrap().get(0);
         assert_eq!(val, &result);
     }
@@ -45,7 +45,7 @@ pub fn test_type_asymmetric<T, F, S, C>(
         let result: F = conn.query_one(&stmt, &[]).unwrap().get(0);
         assert!(cmp(val, &result));
 
-        let stmt = conn.prepare(&format!("SELECT $1::{}", sql_type)).unwrap();
+        let stmt = conn.prepare(&format!("SELECT $1::{sql_type}")).unwrap();
         let result: F = conn.query_one(&stmt, &[val]).unwrap().get(0);
         assert!(cmp(val, &result));
     }

postgres-derive/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## v0.4.7 - 2025-09-25
+
+### Added
+
+* Added support for nested domains containing composite types to `FromSql`
+
+### Fixed
+
+* Added `dyn` keyword to boxed trait objects.
+
+### Changed
+
+* Updated repository links to use `rust-postgres` organization.
+* Upgraded to Rust 2021 edition.
+
+## v0.4.6 - 2024-09-15
+
+### Changed
+
+* Upgraded `heck`.
+
 ## v0.4.5 - 2023-08-19
 
 ### Added

postgres-derive/Cargo.toml

@@ -1,11 +1,12 @@
 [package]
 name = "postgres-derive"
-version = "0.4.5"
+version = "0.4.7"
 authors = ["Steven Fackler <sfackler@palantir.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 description = "An internal crate used by postgres-types"
-repository = "https://github.com/sfackler/rust-postgres"
+repository = "https://github.com/rust-postgres/rust-postgres"
+rust-version = "1.81"
 
 [lib]
 proc-macro = true

postgres-derive/src/fromsql.rs

@@ -179,7 +179,10 @@ fn domain_accepts_body(name: &str, field: &syn::Field) -> TokenStream {
 fn domain_body(ident: &Ident, field: &syn::Field) -> TokenStream {
     let ty = &field.ty;
     quote! {
-        <#ty as postgres_types::FromSql>::from_sql(_type, buf).map(#ident)
+        <#ty as postgres_types::FromSql>::from_sql(match *_type.kind() {
+            postgres_types::Kind::Domain(ref _type) => _type,
+            _ => _type
+        }, buf).map(#ident)
     }
 }
 

postgres-derive/src/overrides.rs

@@ -65,7 +65,7 @@ impl Overrides {
                                         "invalid rename_all rule, expected one of: {}",
                                         RENAME_RULES
                                             .iter()
-                                            .map(|rule| format!("\"{}\"", rule))
+                                            .map(|rule| format!("\"{rule}\""))
                                             .collect::<Vec<_>>()
                                             .join(", ")
                                     ),

postgres-derive/src/tosql.rs

@@ -112,12 +112,12 @@ pub fn expand_derive_tosql(input: DeriveInput) -> Result<TokenStream, Error> {
     let generics = append_generic_bound(input.generics.to_owned(), &new_tosql_bound());
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
     let out = quote! {
-        impl#impl_generics postgres_types::ToSql for #ident#ty_generics #where_clause {
+        impl #impl_generics postgres_types::ToSql for #ident #ty_generics #where_clause {
             fn to_sql(&self,
                       _type: &postgres_types::Type,
                       buf: &mut postgres_types::private::BytesMut)
                       -> std::result::Result<postgres_types::IsNull,
-                                             std::boxed::Box<std::error::Error +
+                                             std::boxed::Box<dyn std::error::Error +
                                                              std::marker::Sync +
                                                              std::marker::Send>> {
                 #to_sql_body
@@ -196,7 +196,7 @@ fn composite_body(fields: &[Field]) -> TokenStream {
                 postgres_types::IsNull::Yes => -1,
                 postgres_types::IsNull::No => {
                     let len = buf.len() - base - 4;
-                    if len > i32::max_value() as usize {
+                    if len > i32::MAX as usize {
                         return std::result::Result::Err(
                             std::convert::Into::into("value too large to transmit"));
                     }

postgres-native-tls/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## v0.5.2 - 2025-09-25
+
+### Changed
+
+* Updated repository links to use `rust-postgres` organization.
+* Upgraded to Rust 2021 edition.
+
+## v0.5.1 - 2025-02-02
+
+### Added
+
+* Added `set_postgresql_alpn`.
+
 ## v0.5.0 - 2020-12-25
 
 ### Changed