Release 0.8.5: transaction override fix & tests

Bump crate and macro versions to 0.8.5 and update docs/examples. Reworked Database::transaction to reinstall the transaction-scoped database override on every poll using a ThreadOverrideGuard and poll_with_thread_override so model/query helpers continue to use the active transaction even if the future is resumed on another thread. Moved inline unit tests out of implementation modules into dedicated files under src/testing/ and added a regression test that polls a transaction-scoped future on two different threads to verify per-poll override behavior. Also updated crate editions to 2021 and refreshed CHANGELOG entries.

Author: mohamadzoh

CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to TideORM will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.5] - 2026-03-20
+
+### Fixed
+
+- Reworked `Database::transaction()` to restore the transaction-scoped database override on every future poll, so model and query helpers keep using the active transaction even if the async runtime resumes the future on a different thread.
+
+### Changed
+
+- Moved the remaining inline unit tests out of implementation modules and into dedicated owner test files under `src/testing/`, keeping private-module coverage while making the source files easier to maintain.
+- Refreshed dependency examples and macro-crate docs to use the 0.8.5 release version.
+
+### Internal
+
+- Added a regression test that manually polls a transaction-scoped future on two different threads to verify the per-poll override behavior.
+- Verified the release prep with `cargo test --lib --features sqlite` and `cargo clippy --workspace --all-targets -- -D warnings`.
+
 ## [0.8.4] - 2026-03-20
 
 ### Fixed
@@ -571,7 +587,8 @@ This is the first public release of TideORM, a developer-friendly ORM for Rust w
 - **Repository:** [https://github.com/mohamadzoh/tideorm](https://github.com/mohamadzoh/tideorm)
 - **Documentation:** See README.md and examples/
 
-[Unreleased]: https://github.com/mohamadzoh/tideorm/compare/v0.8.4...HEAD
+[Unreleased]: https://github.com/mohamadzoh/tideorm/compare/v0.8.5...HEAD
+[0.8.5]: https://github.com/mohamadzoh/tideorm/compare/v0.8.4...v0.8.5
 [0.8.4]: https://github.com/mohamadzoh/tideorm/compare/v0.8.1...v0.8.4
 [0.8.1]: https://github.com/mohamadzoh/tideorm/compare/v0.8.0...v0.8.1
 [0.8.0]: https://github.com/mohamadzoh/tideorm/compare/v0.7.3...v0.8.0

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "tideorm"
-version = "0.8.4"
-edition = "2024"
+version = "0.8.5"
+edition = "2021"
 authors = ["Mohamad Al Zohbie <alzoubi528@gmail.com>"]
 description = "A developer-friendly ORM for Rust with clean, expressive syntax"
 license = "MIT"
@@ -48,7 +48,7 @@ rust_decimal = { version = "1.40.0", features = ["serde"] }
 thiserror = "2.0.18"
 
 # Derive macros (our own crate)
-tideorm-macros = { version = "0.8.4", path = "tideorm-macros" }
+tideorm-macros = { version = "0.8.5", path = "tideorm-macros" }
 
 # Utils
 parking_lot = "0.12.5"

Cargo.toml

@@ -192,22 +192,22 @@ let recent_posts = user.posts.load_with(|q| {
 ```toml
 [dependencies]
 # PostgreSQL (default)
-tideorm = { version = "0.8.4", features = ["postgres"] }
+tideorm = { version = "0.8.5", features = ["postgres"] }
 
 # MySQL
-tideorm = { version = "0.8.4", features = ["mysql"] }
+tideorm = { version = "0.8.5", features = ["mysql"] }
 
 # SQLite
-tideorm = { version = "0.8.4", features = ["sqlite"] }
+tideorm = { version = "0.8.5", features = ["sqlite"] }
 
 # Enable attachments support explicitly
-tideorm = { version = "0.8.4", features = ["postgres", "attachments"] }
+tideorm = { version = "0.8.5", features = ["postgres", "attachments"] }
 
 # Enable translations support explicitly
-tideorm = { version = "0.8.4", features = ["postgres", "translations"] }
+tideorm = { version = "0.8.5", features = ["postgres", "translations"] }
 
 # Enable full-text search support explicitly
-tideorm = { version = "0.8.4", features = ["postgres", "fulltext"] }
+tideorm = { version = "0.8.5", features = ["postgres", "fulltext"] }
 ```
 
 ### Feature Flags

README.md

@@ -514,7 +514,7 @@ TideORM provides full-text search capabilities across PostgreSQL (tsvector/tsque
 Enable the feature explicitly when you need the full-text search API:
 
 ```toml
-tideorm = { version = "0.8.4", features = ["postgres", "fulltext"] }
+tideorm = { version = "0.8.5", features = ["postgres", "fulltext"] }
 ```
 
 ### Search Basics

docs/queries.md

@@ -210,7 +210,7 @@ Enable the feature first:
 
 ```toml
 [dependencies]
-tideorm = { version = "0.8.4", features = ["postgres", "attachments"] }
+tideorm = { version = "0.8.5", features = ["postgres", "attachments"] }
 ```
 
 ### Model Setup
@@ -545,7 +545,7 @@ Enable the feature first:
 
 ```toml
 [dependencies]
-tideorm = { version = "0.8.4", features = ["postgres", "translations"] }
+tideorm = { version = "0.8.5", features = ["postgres", "translations"] }
 ```
 
 ### Model Setup

docs/relations.md

@@ -174,6 +174,36 @@ fn current_scope_handle() -> Result<DatabaseHandle> {
     global_db_handle().current_handle()
 }
 
+struct ThreadOverrideGuard {
+    previous: Option<DatabaseHandle>,
+}
+
+impl ThreadOverrideGuard {
+    fn install(handle: DatabaseHandle) -> Self {
+        Self {
+            previous: Database::replace_thread_override(Some(handle)),
+        }
+    }
+}
+
+impl Drop for ThreadOverrideGuard {
+    fn drop(&mut self) {
+        Database::set_thread_override(self.previous.take());
+    }
+}
+
+fn poll_with_thread_override<F>(
+    future: std::pin::Pin<&mut F>,
+    cx: &mut std::task::Context<'_>,
+    handle: &DatabaseHandle,
+) -> std::task::Poll<F::Output>
+where
+    F: Future + ?Sized,
+{
+    let _guard = ThreadOverrideGuard::install(handle.clone());
+    future.poll(cx)
+}
+
 #[doc(hidden)]
 pub fn __current_connection() -> Result<ConnectionRef> {
     Ok(match current_scope_handle()? {
@@ -423,15 +453,20 @@ impl Database {
                 .map_err(|e| Error::transaction(e.to_string()))?,
         };
 
-        let txn = Arc::new(txn);
-        let tx = Transaction { inner: txn.clone() };
-        let previous_override =
-            Self::replace_thread_override(Some(DatabaseHandle::Transaction(txn.clone())));
-
-        let outcome = f(&tx).await;
+        let outcome = {
+            let txn = Arc::new(txn);
+            let tx = Transaction { inner: txn.clone() };
+            let override_handle = DatabaseHandle::Transaction(txn.clone());
+            let mut future = std::pin::pin!(f(&tx));
+            let outcome = std::future::poll_fn(|cx| {
+                poll_with_thread_override(future.as_mut(), cx, &override_handle)
+            })
+            .await;
+
+            (txn, outcome)
+        };
 
-        Self::set_thread_override(previous_override);
-        drop(tx);
+        let (txn, outcome) = outcome;
 
         match outcome {
             Ok(result) => {
@@ -1063,22 +1098,5 @@ impl Connection for Transaction {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::{Connection, Database};
-
-    #[test]
-    fn hidden_accessors_return_errors_for_disconnected_database() {
-        let db = Database::disconnected();
-
-        assert!(db.__internal_connection().is_err());
-        assert!(db.__internal_backend().is_err());
-        assert!(db.__get_connection().is_err());
-    }
-
-    #[test]
-    fn backend_defaults_safely_for_disconnected_database() {
-        let db = Database::disconnected();
-
-        assert_eq!(db.backend(), crate::config::DatabaseType::Postgres);
-    }
-}
+#[path = "testing/database_tests.rs"]
+mod tests;

src/database.rs

@@ -503,25 +503,5 @@ where
 }
 
 #[cfg(test)]
-mod tests {
-    use super::hash_map_output_key;
-    use serde_json::json;
-
-    #[test]
-    fn hash_map_output_key_hides_structured_presenter_params() {
-        assert_eq!(
-            hash_map_output_key("params", &json!({"view": "minimal"})),
-            None
-        );
-        assert_eq!(hash_map_output_key("params", &json!(["minimal"])), None);
-        assert_eq!(hash_map_output_key("title", &json!("title")), Some("title"));
-    }
-
-    #[test]
-    fn hash_map_output_key_preserves_scalar_params_values() {
-        assert_eq!(
-            hash_map_output_key("params", &json!("keep me")),
-            Some("params")
-        );
-    }
-}
+#[path = "../testing/model_serialization_tests.rs"]
+mod tests;

src/model/serialization.rs

@@ -602,74 +602,8 @@ impl<'de, E: Model> Deserialize<'de> for SelfRefMany<E> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::{Value, build_self_ref_tree_sql};
-    use crate::config::DatabaseType;
-
-    #[derive(tideorm::Model)]
-    #[tideorm(table = "relation_test_nodes")]
-    struct RelationTestNode {
-        #[tideorm(primary_key, auto_increment)]
-        id: i64,
-        slug: String,
-        parent_slug: Option<String>,
-    }
-
-    #[test]
-    fn self_ref_tree_sql_uses_recursive_cte_and_local_key() {
-        let (sql, params) = build_self_ref_tree_sql::<RelationTestNode>(
-            "parent_slug",
-            "slug",
-            &serde_json::json!("root"),
-            3,
-            DatabaseType::Postgres,
-        )
-        .unwrap();
-
-        assert!(sql.starts_with("WITH RECURSIVE \"tide_tree\""));
-        assert!(sql.contains("\"node\".\"slug\" AS \"tree_key\""));
-        assert!(sql.contains("\"child\".\"parent_slug\" = \"tree\".\"tree_key\""));
-        assert!(sql.contains("\"tree\".\"depth\" < $2"));
-        assert!(sql.contains("SELECT \"result_node\".*"));
-        assert!(matches!(params.first(), Some(Value::String(Some(root))) if root == "root"));
-        assert!(matches!(params.get(1), Some(Value::BigInt(Some(depth))) if *depth == 3));
-    }
-
-    #[test]
-    fn self_ref_tree_sql_uses_backend_specific_placeholders() {
-        let (sql, params) = build_self_ref_tree_sql::<RelationTestNode>(
-            "parent_slug",
-            "slug",
-            &serde_json::json!("root"),
-            2,
-            DatabaseType::MySQL,
-        )
-        .unwrap();
-
-        assert!(sql.starts_with("WITH RECURSIVE `tide_tree`"));
-        assert!(sql.contains("`node`.`parent_slug` = ?"));
-        assert!(sql.contains("`tree`.`depth` < ?"));
-        assert!(matches!(params.first(), Some(Value::String(Some(root))) if root == "root"));
-        assert!(matches!(params.get(1), Some(Value::BigInt(Some(depth))) if *depth == 2));
-    }
-
-    #[test]
-    fn self_ref_tree_sql_rejects_unknown_columns() {
-        let err = build_self_ref_tree_sql::<RelationTestNode>(
-            "parent_slug",
-            "missing_column",
-            &serde_json::json!("root"),
-            2,
-            DatabaseType::MySQL,
-        )
-        .unwrap_err();
-
-        assert!(
-            err.to_string()
-                .contains("Unknown self-reference column 'missing_column'")
-        );
-    }
-}
+#[path = "testing/relations_tests.rs"]
+mod tests;
 
 // =============================================================================
 // RELATION TYPE WRAPPERS