diesel-rs · Aug 15, 2023 · Aug 15, 2023 · Aug 15, 2023 · Aug 15, 2023 · Aug 15, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -221,7 +221,7 @@ jobs:
       - name: Test diesel-derives (nightly)
         if: matrix.rust == 'nightly'
         shell: bash
-        run: cargo +${{ matrix.rust }} test --manifest-path diesel_derives/Cargo.toml --no-default-features --features "diesel/${{ matrix.backend }} diesel/unstable"
+        run: cargo +${{ matrix.rust }} test --manifest-path diesel_derives/Cargo.toml --no-default-features --features "diesel/${{ matrix.backend }} diesel/unstable diesel/time time diesel/chrono chrono"
 
       - name: Test diesel-derives
         shell: bash

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,25 @@ Increasing the minimal supported Rust version will always be coupled at least wi
 
 ## Unreleased 
 
+## [2.1.1] 2023-08-xx
+
+## Fixed
+
+* Fixed an issue in diesel-cli that lead to using unquoted table names in one of the internal queries
+* Fixed a bug in `diesel print-schema` that lead to generating invalid `table!` macros if both the `#[sql_name]` and the `#[max_lenght]` attribute are present
+* Fixed an issue in diesel-cli that lead to ignoring certain foreign key constraints for postgresql
+* Fixed an crash while using `diesel print-schema` with really old sqlite versions
+* Fixed an issue where `#[diesel(check_for_backend)]` ignored `#[diesel(deserialize_as)]` attributes
+* Fixed several issues with the new `#[derive(MultiConnection)]` feature
+* Fixed some edge cases in our sqlite timestamp parsing behaviour
+* `diesel migration generate --diff-schema` now respects table filters as setup for `print-schema` via `diesel.toml` 
+* Fixed a potential breaking change around queries containing `DISTINCT ON` and `ORDER BY` clauses consisting of custom sql expressions (e.g. `diesel::dsl::sql`)
+
+## Added 
+
+* Support for bigdecimal 0.4
+
+
 ## [2.1.0] 2023-05-26
 
 ### Changed 
@@ -2018,10 +2037,11 @@ queries or set `PIPES_AS_CONCAT` manually.
 [1.4.8]: https://github.com/diesel-rs/diesel/compare/v1.4.7...v1.4.8
 [2.0.0 Rc0]: https://github.com/diesel-rs/diesel/compare/v.1.4.0...v2.0.0-rc0
 [2.0.0 Rc1]: https://github.com/diesel-rs/diesel/compare/v.2.0.0-rc0...v2.0.0-rc1
-[2.0.0]: https://github.com/diesel-rs/diesel/compare/v.1.4.0...v2.0.0
-[2.0.1]: https://github.com/diesel-rs/diesel/compare/v.2.0.0...v2.0.1
-[2.0.2]: https://github.com/diesel-rs/diesel/compare/v.2.0.1...v2.0.2
+[2.0.0]: https://github.com/diesel-rs/diesel/compare/v1.4.0...v2.0.0
+[2.0.1]: https://github.com/diesel-rs/diesel/compare/v2.0.0...v2.0.1
+[2.0.2]: https://github.com/diesel-rs/diesel/compare/v2.0.1...v2.0.2
 [diesel_derives 2.0.2]: https://github.com/diesel-rs/diesel/compare/v.2.0.2...diesel_derives_v2.0.2
-[2.0.3]: https://github.com/diesel-rs/diesel/compare/v.2.0.2...v2.0.3
-[2.0.4]: https://github.com/diesel-rs/diesel/compare/v.2.0.3...v2.0.4
-[2.1.0]: https://github.com/diesel-rs/diesel/compare/v.2.0.0...v2.1.0
+[2.0.3]: https://github.com/diesel-rs/diesel/compare/v2.0.2...v2.0.3
+[2.0.4]: https://github.com/diesel-rs/diesel/compare/v2.0.3...v2.0.4
+[2.1.0]: https://github.com/diesel-rs/diesel/compare/v2.0.0...v2.1.0
+[2.1.1]: https://github.com/diesel-rs/diesel/compare/v2.1.0...v2.1.1
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-[![](https://diesel.rs/assets/images/diesel_logo_stacked_black.png)](https://diesel.rs)
+[![diesel logo](https://diesel.rs/assets/images/diesel_logo_stacked_black.png)](https://diesel.rs)
+
+# A safe, extensible ORM and Query Builder for Rust
 
-A safe, extensible ORM and Query Builder for Rust
-==========================================================
 [![Build Status](https://github.com/diesel-rs/diesel/workflows/CI%20Tests/badge.svg)](https://github.com/diesel-rs/diesel/actions?query=workflow%3A%22CI+Tests%22+branch%3Amaster)
 [![Gitter](https://badges.gitter.im/diesel-rs/diesel.svg)](https://gitter.im/diesel-rs/diesel?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crates.io](https://img.shields.io/crates/v/diesel.svg)](https://crates.io/crates/diesel)
@@ -21,6 +21,7 @@ Supported databases:
 3. [SQLite](https://docs.diesel.rs/master/diesel/sqlite/index.html)
 
 You can configure the database backend in `Cargo.toml`:
+
 ```toml
 [dependencies]
 diesel = { version = "<version>", features = ["<postgres|mysql|sqlite>"] }
@@ -33,19 +34,19 @@ Find our extensive Getting Started tutorial at
 Guides on more specific features are coming soon.
 
 ## Getting help
+
 If you run into problems, Diesel has a very active Gitter room.
 You can come ask for help at
 [gitter.im/diesel-rs/diesel](https://gitter.im/diesel-rs/diesel).
 For help with longer questions and discussion about the future of Diesel,
 open a discussion on [GitHub Discussions](https://github.com/diesel-rs/diesel/discussions).
 
-## Usage 
+## Usage
 
-### Simple queries 
+### Simple queries
 
 Simple queries are a complete breeze. Loading all users from a database:
 
-
 ```rust
 users::table.load(&mut connection)
 ```
@@ -86,6 +87,7 @@ let downloads = version_downloads
 ```
 
 Executed SQL:
+
 ```sql
 SELECT version_downloads.*
   WHERE date > (NOW() - '90 days')
@@ -172,7 +174,6 @@ INSERT INTO users (name, hair_color) VALUES
 
 If you need data from the rows you inserted, just change `execute` to `get_result` or `get_results`. Diesel will take care of the rest.
 
-
 ```rust
 let new_users = vec![
     NewUser { name: "Sean", hair_color: Some("Black") },
@@ -194,6 +195,7 @@ INSERT INTO users (name, hair_color) VALUES
 ```
 
 ### Updating data
+
 Diesel's codegen can generate several ways to update a row, letting you encapsulate your logic in the way that makes sense for your app.
 
 Modifying a struct:
@@ -219,7 +221,7 @@ update(Settings::belonging_to(current_user))
     .execute(&mut connection)
 ```
 
-### Raw SQL 
+### Raw SQL
 
 There will always be certain queries that are just easier to write as raw SQL, or can't be expressed with the query builder. Even in these cases, Diesel provides an easy to use API for writing raw SQL.
 
@@ -242,7 +244,6 @@ sql_query(include_str!("complex_users_by_organization.sql"))
     .load::<User>(&mut conn)?;
 ```
 
-
 ## Code of conduct
 
 Anyone who interacts with Diesel in any space, including but not limited to
@@ -258,6 +259,7 @@ Licensed under either of these:
    https://opensource.org/licenses/MIT)
 
 ### Contributing
+
 Before contributing, please read the [contributors guide](https://github.com/diesel-rs/diesel/blob/master/CONTRIBUTING.md)
 for useful information about setting up Diesel locally, coding style and common abbreviations.
 

diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "diesel"
-version = "2.1.0"
+version = "2.1.1"
 license = "MIT OR Apache-2.0"
 description = "A safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL"
 readme = "README.md"
@@ -29,7 +29,7 @@ ipnet = { version = "2.5.0", optional = true }
 num-bigint = { version = ">=0.2.0, <0.5.0", optional = true }
 num-traits = { version = "0.2.0", optional = true }
 num-integer = { version = "0.1.39", optional = true }
-bigdecimal = { version = ">=0.0.13, < 0.4.0", optional = true }
+bigdecimal = { version = ">=0.0.13, < 0.5.0", optional = true }
 bitflags = { version = "2.0.0", optional = true }
 r2d2 = { version = ">= 0.8.2, < 0.9.0", optional = true }
 itoa = { version = "1.0.0", optional = true }
@@ -68,6 +68,8 @@ returning_clauses_for_sqlite_3_35 = []
 i-implement-a-third-party-backend-and-opt-into-breaking-changes = []
 nightly-error-messages = []
 r2d2 = ["diesel_derives/r2d2", "dep:r2d2"]
+chrono = ["diesel_derives/chrono", "dep:chrono"]
+time = ["diesel_derives/time", "dep:time"]
 
 [package.metadata.docs.rs]
 features = ["postgres", "mysql", "sqlite", "extras"]

diff --git a/diesel/src/connection/mod.rs b/diesel/src/connection/mod.rs
@@ -16,8 +16,8 @@ use crate::result::*;
 use std::fmt::Debug;
 
 pub use self::transaction_manager::{
-    AnsiTransactionManager, TransactionDepthChange, TransactionManager, TransactionManagerStatus,
-    ValidTransactionManagerStatus,
+    AnsiTransactionManager, InTransactionStatus, TransactionDepthChange, TransactionManager,
+    TransactionManagerStatus, ValidTransactionManagerStatus,
 };
 
 #[diesel_derives::__diesel_public_if(

diff --git a/diesel/src/connection/transaction_manager.rs b/diesel/src/connection/transaction_manager.rs
@@ -170,13 +170,29 @@ impl TransactionManagerStatus {
         *self = TransactionManagerStatus::InError
     }
 
-    fn transaction_state(&mut self) -> QueryResult<&mut ValidTransactionManagerStatus> {
+    /// Expose access to the inner transaction state
+    ///
+    /// This function returns an error if the Transaction manager is in a broken
+    /// state
+    #[diesel_derives::__diesel_public_if(
+        feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes"
+    )]
+    pub(self) fn transaction_state(&mut self) -> QueryResult<&mut ValidTransactionManagerStatus> {
         match self {
             TransactionManagerStatus::Valid(valid_status) => Ok(valid_status),
             TransactionManagerStatus::InError => Err(Error::BrokenTransactionManager),
         }
     }
 
+    /// This function allows to flag a transaction manager
+    /// in such a way that it contains a test transaction.
+    ///
+    /// This will disable some checks in regards to open transactions
+    /// to allow `Connection::begin_test_transaction` to work with
+    /// pooled connections as well
+    #[diesel_derives::__diesel_public_if(
+        feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes"
+    )]
     pub(crate) fn set_test_transaction_flag(&mut self) {
         if let TransactionManagerStatus::Valid(ValidTransactionManagerStatus {
             in_transaction: Some(s),
@@ -190,17 +206,34 @@ impl TransactionManagerStatus {
 /// Valid transaction status for the manager. Can return the current transaction depth
 #[allow(missing_copy_implementations)]
 #[derive(Debug, Default)]
+#[diesel_derives::__diesel_public_if(
+    feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
+    public_fields(in_transaction)
+)]
 pub struct ValidTransactionManagerStatus {
+    /// Inner status, or `None` if no transaction is runnin
     in_transaction: Option<InTransactionStatus>,
 }
 
+/// Various status fields to track the status of
+/// a transaction manager with a started transaction
 #[allow(missing_copy_implementations)]
 #[derive(Debug)]
-struct InTransactionStatus {
+#[diesel_derives::__diesel_public_if(
+    feature = "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
+    public_fields(
+        test_transaction,
+        transaction_depth,
+        requires_rollback_maybe_up_to_top_level
+    )
+)]
+pub struct InTransactionStatus {
+    /// The current depth of nested transactions
     transaction_depth: NonZeroU32,
     /// If that is registered, savepoints rollbacks will still be attempted, but failure to do so
     /// will not result in an error. (Some may succeed, some may not.)
     requires_rollback_maybe_up_to_top_level: bool,
+    /// Is this transaction manager status marked as test-transaction?
     test_transaction: bool,
 }
 

diff --git a/diesel/src/internal/derives.rs b/diesel/src/internal/derives.rs
@@ -69,4 +69,12 @@ pub mod multiconnection {
 
     #[doc(hidden)]
     pub use crate::query_builder::select_statement::SelectStatementAccessor;
+
+    #[doc(hidden)]
+    #[cfg(feature = "chrono")]
+    pub use chrono;
+
+    #[doc(hidden)]
+    #[cfg(feature = "time")]
+    pub use time;
 }
diff --git a/diesel/src/mysql/connection/bind.rs b/diesel/src/mysql/connection/bind.rs
@@ -734,16 +734,15 @@ fn known_buffer_size_for_ffi_type(tpe: ffi::enum_field_types) -> Option<usize> {
 
 #[cfg(test)]
 mod tests {
-    #[cfg(feature = "bigdecimal")]
-    use bigdecimal::FromPrimitive;
-
     use super::MysqlValue;
     use super::*;
     use crate::connection::statement_cache::MaybeCached;
     use crate::deserialize::FromSql;
     use crate::mysql::connection::stmt::Statement;
     use crate::prelude::*;
     use crate::sql_types::*;
+    #[cfg(feature = "bigdecimal")]
+    use std::str::FromStr;
 
     fn to_value<ST, T>(
         bind: &BindData,
@@ -935,7 +934,7 @@ mod tests {
         assert!(!numeric_col.flags.contains(Flags::UNSIGNED_FLAG));
         assert_eq!(
             to_value::<Numeric, bigdecimal::BigDecimal>(numeric_col).unwrap(),
-            bigdecimal::BigDecimal::from_f32(-999.999).unwrap()
+            bigdecimal::BigDecimal::from_str("-999.99900").unwrap()
         );
 
         let decimal_col = &results[8].0;
@@ -947,7 +946,7 @@ mod tests {
         assert!(!decimal_col.flags.contains(Flags::UNSIGNED_FLAG));
         assert_eq!(
             to_value::<Numeric, bigdecimal::BigDecimal>(decimal_col).unwrap(),
-            bigdecimal::BigDecimal::from_f32(3.14).unwrap()
+            bigdecimal::BigDecimal::from_str("3.14000").unwrap()
         );
 
         let float_col = &results[9].0;