Merge pull request #4641 from weiznich/prepare/diesel_2.2.11

Prepare/diesel 2.2.11

Author: weiznich

.typos.toml

@@ -23,6 +23,8 @@ extend-ignore-re = [
     "big_sur",
     # That's Spanish for "type" (used in a unit-test)
     "tipe",
+    # we use this often in place of the reserved type identifier
+    "tpe", 
 ]
 
 [type.md]

CHANGELOG.md

@@ -10,6 +10,15 @@ Increasing the minimal supported Rust version will always be coupled at least wi
 
 ## Unreleased
 
+## [2.2.11] 2025-06-12
+
+## Fixed
+
+* Disallow mixing aggregate and non-aggregate expressions in `DISTINCT ON` clauses
+* Fixed an item referenced by a non-absolute path in `#[derive(MultiConnection)]`
+* Improved compiler errors in some cases
+* Improved the documentation for creating SqliteConnections for concurrent applications
+
 ## [2.2.10] 2025-04-25
 
 ## Fixed
@@ -2206,3 +2215,4 @@ queries or set `PIPES_AS_CONCAT` manually.
 [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
+[2.2.11]: https://github.com/diesel-rs/diesel/compare/v2.2.10...v2.2.11

README.md

@@ -263,3 +263,50 @@ for useful information about setting up Diesel locally, coding style and common
 Unless you explicitly state otherwise, any contribution you intentionally submit
 for inclusion in the work, as defined in the Apache-2.0 license, shall be
 dual-licensed as above, without any additional terms or conditions.
+
+### Notable Sponsors and Supporters
+
+We would like to thank all of the sponsors supporting the work on Diesel. Notable large sponsors are:
+
+
+<p align="center">
+    <a href="https://nlnet.nl/project/Diesel/">
+        <img src="https://diesel.rs/assets/images/nl_net_foundation_logo.svg" width="50%"/>
+        <br/>
+        NLNet Foundation
+    </a>
+</p>
+
+<p align="center">
+    <a href="https://nlnet.nl/project/Diesel/">
+        <img src="https://diesel.rs/assets/images/NGI0Core_tag.svg" width="50%"/>
+        <br/>
+        NGI Zero Core
+    </a>
+</p>
+
+<p align="center">
+    <a href="https://www.prototypefund.de/projects/diesel-databaseviews">
+        <img src="https://diesel.rs/assets/images/PrototypeFund_logo_dark.png" width="50%"/>
+        <br/>
+        Prototype Fund
+    </a>
+</p>
+
+<p align="center">
+    <a href="https://www.prototypefund.de/projects/diesel-databaseviews">
+        <img src="https://diesel.rs/assets/images/bmbf_logo.jpg" width="50%"/>
+        <br/>
+        Federal Ministry of Research, Technology and Space (Germany)
+    </a>
+</p>
+
+<p align="center">
+    <a href="https://giga-infosystems.com/">
+        <img src="https://diesel.rs/assets/images/logo_giga.svg" width="35%"/>
+        <br/>
+        GiGa Infosystems GmbH
+    </a>
+</p>
+
+Additionally we would like to thank all persons sponsoring the project on [GitHub](https://github.com/sponsors/weiznich#sponsors). Without them developing Diesel wouldn't be possible.

diesel/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "diesel"
-version = "2.2.10"
+version = "2.2.11"
 license = "MIT OR Apache-2.0"
 description = "A safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL"
 readme = "README.md"

diesel/src/expression/grouped.rs

@@ -5,7 +5,8 @@ use crate::result::QueryResult;
 use crate::sql_types::DieselNumericOps;
 
 #[derive(Debug, Copy, Clone, QueryId, Default, DieselNumericOps, ValidGrouping)]
-pub struct Grouped<T>(pub T);
+#[doc(hidden)]
+pub struct Grouped<T>(pub(crate) T);
 
 impl<T: Expression> Expression for Grouped<T> {
     type SqlType = T::SqlType;

diesel/src/expression/mod.rs

@@ -706,6 +706,11 @@ impl<T: ValidGrouping<GB> + ?Sized, GB> ValidGrouping<GB> for &T {
 pub use diesel_derives::ValidGrouping;
 
 #[doc(hidden)]
+#[diagnostic::on_unimplemented(
+    note = "if your query contains columns from several tables in your group by or select \
+            clause make sure to call `allow_columns_to_appear_in_same_group_by_clause!` \
+            with these columns"
+)]
 pub trait IsContainedInGroupBy<T> {
     type Output;
 }

diesel/src/mysql/query_builder/query_fragment_impls.rs

@@ -149,7 +149,7 @@ where
 }
 
 /// This is a helper trait
-/// that provideds a fake `DO NOTHING` clause
+/// that provides a fake `DO NOTHING` clause
 /// based on reassigning the possible
 /// composite primary key to itself
 trait DoNothingClauseHelper {

diesel/src/pg/connection/copy.rs

@@ -26,7 +26,7 @@ impl Write for CopyFromSink<'_> {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
         self.conn
             .put_copy_data(buf)
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+            .map_err(std::io::Error::other)?;
         Ok(buf.len())
     }
 
@@ -103,13 +103,12 @@ impl BufRead for CopyToBuffer<'_> {
                     pq_sys::PQgetCopyData(self.conn.internal_connection.as_ptr(), &mut self.ptr, 0);
                 match len {
                     len if len >= 0 => {
-                        self.len = 1 + usize::try_from(len)
-                            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
+                        self.len = 1 + usize::try_from(len).map_err(std::io::Error::other)?
                     }
                     -1 => self.len = 0,
                     _ => {
                         let error = self.conn.last_error_message();
-                        return Err(std::io::Error::new(std::io::ErrorKind::Other, error));
+                        return Err(std::io::Error::other(error));
                     }
                 }
                 self.offset = 0;

diesel/src/pg/query_builder/distinct_on.rs

@@ -1,9 +1,12 @@
-use crate::expression::SelectableExpression;
+use crate::expression::{SelectableExpression, ValidGrouping};
 use crate::pg::Pg;
+use crate::query_builder::group_by_clause::ValidGroupByClause;
 use crate::query_builder::order_clause::NoOrderClause;
 use crate::query_builder::{
-    AstPass, FromClause, QueryFragment, QueryId, SelectQuery, SelectStatement,
+    AstPass, FromClause, QueryFragment, QueryId, SelectClauseExpression, SelectQuery,
+    SelectStatement,
 };
+use crate::query_dsl::group_by_dsl::ValidDistinctForGroupBy;
 use crate::query_dsl::methods::DistinctOnDsl;
 use crate::query_dsl::order_dsl::ValidOrderingForDistinct;
 use crate::result::QueryResult;
@@ -20,6 +23,8 @@ impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for NoOrderClause {}
 impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<(T,)> {}
 impl<T> ValidOrderingForDistinct<DistinctOnClause<T>> for OrderClause<T> where T: crate::Expression {}
 
+impl<S, G, D> ValidDistinctForGroupBy<S, G> for DistinctOnClause<D> where (D, S): ValidGrouping<G> {}
+
 impl<T> ValidOrderingForDistinct<DistinctOnClause<T>>
     for OrderClause<crate::expression::operators::Asc<T>>
 where
@@ -279,12 +284,15 @@ where
 impl<ST, F, S, D, W, O, LOf, G, H, Selection> DistinctOnDsl<Selection>
     for SelectStatement<FromClause<F>, S, D, W, O, LOf, G, H>
 where
+    G: ValidGroupByClause,
     F: QuerySource,
     Selection: SelectableExpression<F>,
     Self: SelectQuery<SqlType = ST>,
     O: ValidOrderingForDistinct<DistinctOnClause<Selection>>,
     SelectStatement<FromClause<F>, S, DistinctOnClause<Selection>, W, O, LOf, G, H>:
         SelectQuery<SqlType = ST>,
+    S: SelectClauseExpression<FromClause<F>>,
+    (Selection, S::Selection): ValidGrouping<G::Expressions>,
 {
     type Output = SelectStatement<FromClause<F>, S, DistinctOnClause<Selection>, W, O, LOf, G, H>;
 

diesel/src/query_builder/distinct_clause.rs

@@ -1,5 +1,6 @@
 use crate::backend::DieselReserveSpecialization;
 use crate::query_builder::*;
+use crate::query_dsl::group_by_dsl::ValidDistinctForGroupBy;
 use crate::query_dsl::order_dsl::ValidOrderingForDistinct;
 
 #[derive(Debug, Clone, Copy, QueryId)]
@@ -28,6 +29,8 @@ where
 
 impl<O> ValidOrderingForDistinct<NoDistinctClause> for O {}
 impl<O> ValidOrderingForDistinct<DistinctClause> for O {}
+impl<S, G> ValidDistinctForGroupBy<S, G> for NoDistinctClause {}
+impl<S, G> ValidDistinctForGroupBy<S, G> for DistinctClause {}
 
 // This is rexported from another location
 #[allow(unreachable_pub, unused_imports)]