Merge pull request #4580 from weiznich/prepare/diesel_2.2.10

Prepare diesel 2.2.10

Author: weiznich

.github/workflows/release.yml

@@ -47,7 +47,7 @@ on:
 jobs:
   # Run 'cargo dist plan' (or host) to determine what tasks we need to do
   plan:
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     outputs:
       val: ${{ steps.plan.outputs.manifest }}
       tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -160,7 +160,7 @@ jobs:
     needs:
       - plan
       - build-local-artifacts
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -210,7 +210,7 @@ jobs:
     if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
@@ -272,7 +272,7 @@ jobs:
     # still allowing individual publish jobs to skip themselves (for prereleases).
     # "host" however must run to completion, no skipping allowed!
     if: ${{ always() && needs.host.result == 'success' }}
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:

CHANGELOG.md

@@ -10,6 +10,13 @@ Increasing the minimal supported Rust version will always be coupled at least wi
 
 ## Unreleased
 
+## [2.2.10] 2025-04-25
+
+## Fixed
+
+* Support for libsqlite3-sys 0.33.0
+* Fixed potential ambiguities in code generated by various derives
+
 ## [2.2.9] 2025-04-04
 ### Fixed
 
@@ -2198,3 +2205,4 @@ queries or set `PIPES_AS_CONCAT` manually.
 [2.2.7]: https://github.com/diesel-rs/diesel/compare/v2.2.6...v2.2.7
 [2.2.8]: https://github.com/diesel-rs/diesel/compare/v2.2.7...v2.2.8
 [2.2.9]: https://github.com/diesel-rs/diesel/compare/v2.2.8...v2.2.9
+[2.2.10]: https://github.com/diesel-rs/diesel/compare/v2.2.9...v2.2.10

Cargo.toml

@@ -35,7 +35,7 @@ rust-version = "1.78.0"
 include = ["src/**/*.rs", "tests/**/*.rs", "LICENSE-*", "README.md"]
 
 [workspace.dependencies]
-libsqlite3-sys = ">=0.30.1,<0.33.0"
+libsqlite3-sys = ">=0.30.1,<0.34.0"
 
 # Config for 'cargo dist'
 [workspace.metadata.dist]
@@ -59,6 +59,7 @@ install-path = "CARGO_HOME"
 [workspace.metadata.dist.github-custom-runners]
 aarch64-apple-darwin = "macos-14"
 x86_64-unknown-linux-gnu = "ubuntu-22.04"
+global = "ubuntu-latest"
 
 [profile.dev.package.insta]
 opt-level = 3

diesel/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "diesel"
-version = "2.2.9"
+version = "2.2.10"
 license = "MIT OR Apache-2.0"
 description = "A safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL"
 readme = "README.md"
@@ -24,7 +24,7 @@ include = [
 byteorder = { version = "1.0", optional = true }
 chrono = { version = "0.4.20", optional = true, default-features = false, features = ["clock", "std"] }
 libc = { version = "0.2.0", optional = true }
-libsqlite3-sys = { version = ">=0.17.2, <0.33.0", optional = true, features = ["bundled_bindings"] }
+libsqlite3-sys = { version = ">=0.17.2, <0.34.0", optional = true, features = ["bundled_bindings"] }
 mysqlclient-sys = { version = ">=0.2.5, <0.5.0",  optional = true }
 mysqlclient-src = { version = "0.1.0", optional = true }
 pq-sys = { version = ">=0.4.0, <0.8.0", optional = true }

diesel_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "diesel_cli"
-version = "2.2.9"
+version = "2.2.10"
 license = "MIT OR Apache-2.0"
 description = "Provides the CLI for the Diesel crate"
 readme = "README.md"

diesel_compile_tests/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "diesel_derives"
-version = "2.2.4"
+version = "2.2.5"
 license = "MIT OR Apache-2.0"
 description = "You should not use this crate directly, it is internal to Diesel."
 documentation = "https://diesel.rs/guides/"

diesel_derives/Cargo.toml

@@ -108,14 +108,14 @@ pub fn derive(item: DeriveInput) -> Result<TokenStream> {
     }
 
     let changeset_owned = quote! {
-        impl #impl_generics AsChangeset for #struct_name #ty_generics
+        impl #impl_generics diesel::query_builder::AsChangeset for #struct_name #ty_generics
         #where_clause
         {
             type Target = #table_name::table;
-            type Changeset = <(#(#direct_field_ty,)*) as AsChangeset>::Changeset;
+            type Changeset = <(#(#direct_field_ty,)*) as diesel::query_builder::AsChangeset>::Changeset;
 
-            fn as_changeset(self) -> Self::Changeset {
-                (#(#direct_field_assign,)*).as_changeset()
+            fn as_changeset(self) -> <Self as diesel::query_builder::AsChangeset>::Changeset {
+                diesel::query_builder::AsChangeset::as_changeset((#(#direct_field_assign,)*))
             }
         }
     };
@@ -126,14 +126,14 @@ pub fn derive(item: DeriveInput) -> Result<TokenStream> {
         let (impl_generics, _, _) = impl_generics.split_for_impl();
 
         quote! {
-            impl #impl_generics AsChangeset for &'update #struct_name #ty_generics
+            impl #impl_generics diesel::query_builder::AsChangeset for &'update #struct_name #ty_generics
             #where_clause
             {
                 type Target = #table_name::table;
-                type Changeset = <(#(#ref_field_ty,)*) as AsChangeset>::Changeset;
+                type Changeset = <(#(#ref_field_ty,)*) as diesel::query_builder::AsChangeset>::Changeset;
 
-                fn as_changeset(self) -> Self::Changeset {
-                    (#(#ref_field_assign,)*).as_changeset()
+                fn as_changeset(self) -> <Self as diesel::query_builder::AsChangeset>::Changeset {
+                    diesel::query_builder::AsChangeset::as_changeset((#(#ref_field_assign,)*))
                 }
             }
         }
@@ -142,9 +142,6 @@ pub fn derive(item: DeriveInput) -> Result<TokenStream> {
     };
 
     Ok(wrap_in_dummy_mod(quote!(
-        use diesel::query_builder::AsChangeset;
-        use diesel::prelude::*;
-
         #changeset_owned
 
         #changeset_borrowed
@@ -179,12 +176,18 @@ fn field_changeset_expr(
     let column_name = field.column_name()?.to_ident()?;
     if !treat_none_as_null && is_option_ty(&field.ty) {
         if lifetime.is_some() {
-            Ok(quote!(self.#field_name.as_ref().map(|x| #table_name::#column_name.eq(x))))
+            Ok(
+                quote!(self.#field_name.as_ref().map(|x| diesel::ExpressionMethods::eq(#table_name::#column_name, x))),
+            )
         } else {
-            Ok(quote!(self.#field_name.map(|x| #table_name::#column_name.eq(x))))
+            Ok(
+                quote!(self.#field_name.map(|x| diesel::ExpressionMethods::eq(#table_name::#column_name, x))),
+            )
         }
     } else {
-        Ok(quote!(#table_name::#column_name.eq(#lifetime self.#field_name)))
+        Ok(
+            quote!(diesel::ExpressionMethods::eq(#table_name::#column_name, #lifetime self.#field_name)),
+        )
     }
 }
 
@@ -213,7 +216,9 @@ fn field_changeset_expr_serialize_as(
     let column_name = field.column_name()?.to_ident()?;
     let column: Expr = parse_quote!(#table_name::#column_name);
     if !treat_none_as_null && is_option_ty(&field.ty) {
-        Ok(quote!(self.#field_name.map(|x| #column.eq(::std::convert::Into::<#ty>::into(x)))))
+        Ok(
+            quote!(self.#field_name.map(|x| diesel::ExpressionMethods::eq(#column, ::std::convert::Into::<#ty>::into(x)))),
+        )
     } else {
         Ok(quote!(#column.eq(::std::convert::Into::<#ty>::into(self.#field_name))))
     }

diesel_derives/src/as_changeset.rs

@@ -36,56 +36,56 @@ pub fn derive(item: DeriveInput) -> Result<TokenStream> {
         let mut to_sql_generics = item.generics.clone();
         to_sql_generics.params.push(parse_quote!(__DB));
         to_sql_generics.make_where_clause().predicates.push(parse_quote!(__DB: diesel::backend::Backend));
-        to_sql_generics.make_where_clause().predicates.push(parse_quote!(Self: ToSql<#sql_type, __DB>));
+        to_sql_generics.make_where_clause().predicates.push(parse_quote!(Self: diesel::serialize::ToSql<#sql_type, __DB>));
         let (to_sql_impl_generics, _, to_sql_where_clause) = to_sql_generics.split_for_impl();
 
         let tokens = quote!(
-            impl #impl_generics AsExpression<#sql_type>
+            impl #impl_generics diesel::expression::AsExpression<#sql_type>
                 for &'__expr #struct_ty #where_clause
             {
-                type Expression = Bound<#sql_type, Self>;
+                type Expression = diesel::internal::derives::as_expression::Bound<#sql_type, Self>;
 
-                fn as_expression(self) -> Self::Expression {
-                    Bound::new(self)
+                fn as_expression(self) -> <Self as diesel::expression::AsExpression<#sql_type>>::Expression {
+                    diesel::internal::derives::as_expression::Bound::new(self)
                 }
             }
 
-            impl #impl_generics AsExpression<Nullable<#sql_type>>
+            impl #impl_generics diesel::expression::AsExpression<diesel::sql_types::Nullable<#sql_type>>
                 for &'__expr #struct_ty #where_clause
             {
-                type Expression = Bound<Nullable<#sql_type>, Self>;
+                type Expression = diesel::internal::derives::as_expression::Bound<diesel::sql_types::Nullable<#sql_type>, Self>;
 
-                fn as_expression(self) -> Self::Expression {
-                    Bound::new(self)
+                fn as_expression(self) -> <Self as diesel::expression::AsExpression<diesel::sql_types::Nullable<#sql_type>>>::Expression {
+                    diesel::internal::derives::as_expression::Bound::new(self)
                 }
             }
 
-            impl #impl_generics2 AsExpression<#sql_type>
+            impl #impl_generics2 diesel::expression::AsExpression<#sql_type>
                 for &'__expr2 &'__expr #struct_ty #where_clause2
             {
-                type Expression = Bound<#sql_type, Self>;
+                type Expression = diesel::internal::derives::as_expression::Bound<#sql_type, Self>;
 
-                fn as_expression(self) -> Self::Expression {
-                    Bound::new(self)
+                fn as_expression(self) -> <Self as diesel::expression::AsExpression<#sql_type>>::Expression {
+                    diesel::internal::derives::as_expression::Bound::new(self)
                 }
             }
 
-            impl #impl_generics2 AsExpression<Nullable<#sql_type>>
+            impl #impl_generics2 diesel::expression::AsExpression<diesel::sql_types::Nullable<#sql_type>>
                 for &'__expr2 &'__expr #struct_ty #where_clause2
             {
-                type Expression = Bound<Nullable<#sql_type>, Self>;
+                type Expression = diesel::internal::derives::as_expression::Bound<diesel::sql_types::Nullable<#sql_type>, Self>;
 
-                fn as_expression(self) -> Self::Expression {
-                    Bound::new(self)
+                fn as_expression(self) -> <Self as diesel::expression::AsExpression<diesel::sql_types::Nullable<#sql_type>>>::Expression {
+                    diesel::internal::derives::as_expression::Bound::new(self)
                 }
             }
 
-            impl #to_sql_impl_generics diesel::serialize::ToSql<Nullable<#sql_type>, __DB>
+            impl #to_sql_impl_generics diesel::serialize::ToSql<diesel::sql_types::Nullable<#sql_type>, __DB>
                 for #struct_ty #to_sql_where_clause
             {
-                fn to_sql<'__b>(&'__b self, out: &mut Output<'__b, '_, __DB>) -> serialize::Result
+                fn to_sql<'__b>(&'__b self, out: &mut diesel::serialize::Output<'__b, '_, __DB>) -> diesel::serialize::Result
                 {
-                    ToSql::<#sql_type, __DB>::to_sql(self, out)
+                    diesel::serialize::ToSql::<#sql_type, __DB>::to_sql(self, out)
                 }
             }
         );
@@ -96,31 +96,28 @@ pub fn derive(item: DeriveInput) -> Result<TokenStream> {
             quote!(
                 #tokens
 
-                impl #impl_generics_plain AsExpression<#sql_type> for #struct_ty #where_clause_plain {
-                    type Expression = Bound<#sql_type, Self>;
+                impl #impl_generics_plain diesel::expression::AsExpression<#sql_type> for #struct_ty #where_clause_plain {
+                    type Expression = diesel::internal::derives::as_expression::Bound<#sql_type, Self>;
 
-                    fn as_expression(self) -> Self::Expression {
-                        Bound::new(self)
+                    fn as_expression(self) -> <Self as diesel::expression::AsExpression<#sql_type>>::Expression {
+                        diesel::internal::derives::as_expression::Bound::new(self)
                     }
                 }
 
-                impl #impl_generics_plain AsExpression<Nullable<#sql_type>> for #struct_ty #where_clause_plain {
-                    type Expression = Bound<Nullable<#sql_type>, Self>;
+                impl #impl_generics_plain diesel::expression::AsExpression<diesel::sql_types::Nullable<#sql_type>> for #struct_ty
+                #where_clause_plain
+                {
+                    type Expression = diesel::internal::derives::as_expression::Bound<diesel::sql_types::Nullable<#sql_type>, Self>;
 
-                    fn as_expression(self) -> Self::Expression {
-                        Bound::new(self)
+                    fn as_expression(self) -> <Self as diesel::expression::AsExpression<diesel::sql_types::Nullable<#sql_type>>>::Expression {
+                        diesel::internal::derives::as_expression::Bound::new(self)
                     }
                 }
             )
         }
     });
 
     Ok(wrap_in_dummy_mod(quote! {
-        use diesel::expression::AsExpression;
-        use diesel::internal::derives::as_expression::Bound;
-        use diesel::sql_types::Nullable;
-        use diesel::serialize::{self, ToSql, Output};
-
         #(#tokens)*
     }))
 }

diesel_derives/src/as_expression.rs

@@ -23,20 +23,18 @@ pub fn derive(mut item: DeriveInput) -> Result<TokenStream> {
             .push(parse_quote!(__ST: diesel::sql_types::SingleValue));
         where_clause
             .predicates
-            .push(parse_quote!(Self: FromSql<__ST, __DB>));
+            .push(parse_quote!(Self: diesel::deserialize::FromSql<__ST, __DB>));
     }
     let (impl_generics, _, where_clause) = item.generics.split_for_impl();
 
     Ok(wrap_in_dummy_mod(quote! {
-        use diesel::deserialize::{self, FromSql, Queryable};
-
         // Need to put __ST and __DB after lifetimes but before const params
-        impl #impl_generics Queryable<__ST, __DB> for #struct_ty
+        impl #impl_generics diesel::deserialize::Queryable<__ST, __DB> for #struct_ty
         #where_clause
         {
             type Row = Self;
 
-            fn build(row: Self::Row) -> deserialize::Result<Self> {
+            fn build(row: Self) -> diesel::deserialize::Result<Self> {
                 Ok(row)
             }
         }