Merge pull request #54 from NikkeTryHard/feat/issue-23-sqlalchemy-031

feat: SQLAlchemy 0.3.1 Support

Author: NikkeTryHard

docs/research/roadmap.md

@@ -257,7 +257,8 @@ flowchart TB
     class P5_1 inProgress
     class P5_3,P5_5,P6_0,P6_2,P7_0,P7_1,P7_6,P8_0,P9_2,P9_5,P9_6,P9_7 canStart
     class P2_4,P2_5 done
-    class P3_0,P3_1,P3_2,P3_3 pending
+    class P3_0,P3_1 done
+    class P3_2,P3_3 pending
     class P4_0,P4_1,P4_2,P4_3,P4_4,P4_5,P4_6 pending
     class P5_2,P5_4 pending
     class P6_1,P6_3,P6_4,P6_5 pending
@@ -811,28 +812,28 @@ The 0.3.x series focuses on database test isolation. The key insight is that dat
 
 **Target**: SQLAlchemy session management.
 
+**Status**: ✅ COMPLETE
+
 #### Session Management
 
-- [ ] Hook into `Session.commit()` to prevent actual commits
-  > **Ref**: "Injecting SAVEPOINT and ROLLBACK TO SAVEPOINT to make DB tests I/O-free" — _Rust-Python Test Isolation Blueprint_
-- [ ] Wrap sessions in nested transactions (savepoints)
-- [ ] Handle `Session.rollback()` within tests
-- [ ] Support scoped session patterns
-- [ ] Handle session-per-request patterns
+- [x] Hook into `Session.commit()` to prevent actual commits
+- [x] Wrap sessions in nested transactions (savepoints)
+- [x] Handle `Session.rollback()` within tests
+- [x] Support scoped session patterns
+- [x] Handle session-per-request patterns
 
 #### Engine Configuration
 
-- [ ] Detect SQLAlchemy engine configuration
-- [ ] Apply connection pooling optimizations
-- [ ] Handle multiple engines (read replicas, etc.)
-- [ ] Support async SQLAlchemy (asyncpg, aiosqlite)
-- [ ] Handle engine disposal
-  > **Ref**: "For applications using database drivers, adopt the 'dispose pattern.' Ensure that any connection pool created in the parent is explicitly discarded" — _Fork Safety of Python C-Extensions_
+- [x] Detect SQLAlchemy engine configuration
+- [x] Apply connection pooling optimizations
+- [x] Handle multiple engines (read replicas, etc.)
+- [x] Support async SQLAlchemy (asyncpg, aiosqlite)
+- [x] Handle engine disposal
 
 #### Alembic Integration
 
-- [ ] Detect Alembic migration configuration
-- [ ] Verify migration state matches expected
+- [x] Detect Alembic migration configuration
+- [x] Verify migration state matches expected
 - [ ] Support running migrations before tests
 - [ ] Handle migration downgrade on test database
 - [ ] Support migration branching

rust_tests/phase4_integration.rs

@@ -154,6 +154,8 @@ fn test_payload_is_toxic_propagation() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     let toxic_payload = TestPayload {
@@ -170,6 +172,8 @@ fn test_payload_is_toxic_propagation() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     // Verify is_toxic is correctly set

rust_tests/proptest_coverage.rs

@@ -150,6 +150,8 @@ proptest! {
             cached_effects: vec![],
             markers: vec![],
             marker_info: vec![],
+            reuse_db: false,
+            create_db: false,
         };
 
         let serialized = bincode::serde::encode_to_vec(&payload, bincode::config::standard()).expect("Failed to serialize");

rust_tests/protocol_integration.rs

@@ -26,6 +26,8 @@ fn test_serialize_test_payload() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     let encoded = encode_with_length(&payload).expect("Should serialize");
@@ -106,6 +108,8 @@ fn test_roundtrip_test_payload() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     let encoded = encode_with_length(&original).expect("Should serialize");
@@ -183,6 +187,8 @@ fn test_empty_fixtures_payload() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     let encoded = encode_with_length(&payload).expect("Should serialize empty fixtures");
@@ -205,6 +211,8 @@ fn test_async_payload() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     let encoded = encode_with_length(&payload).expect("Should serialize");

rust_tests/tagging_integrity.rs

@@ -178,6 +178,8 @@ fn test_toxicity_survives_serialization_roundtrip() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     // Create a safe TestPayload
@@ -195,6 +197,8 @@ fn test_toxicity_survives_serialization_roundtrip() {
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     // Serialize using bincode (same as scheduler.rs)
@@ -314,6 +318,8 @@ def test_network_stuff():
         cached_effects: vec![],
         markers: vec![],
         marker_info: vec![],
+        reuse_db: false,
+        create_db: false,
     };
 
     // Step 6: Serialize and deserialize (simulating IPC)

src/execution/zygote.rs

@@ -1125,6 +1125,11 @@ fn convert_cached_effects_to_py<'py>(
                 // Not converted to Python dict here - it's already in marker_info
                 continue;
             }
+            crate::hooks::HookEffect::SqlAlchemyDbSetup { .. } => {
+                // SqlAlchemyDbSetup is handled by Python harness via marker_info
+                // Not converted to Python dict here - it's already in marker_info
+                continue;
+            }
             crate::hooks::HookEffect::AsyncioSetup {
                 loop_scope,
                 auto_mode,

src/hooks/registry.rs

@@ -237,6 +237,12 @@ pub enum HookEffect {
         /// List of database aliases to apply isolation to
         databases: Vec<String>,
     },
+    /// SQLAlchemy database setup effect.
+    /// Signals that a test requires SQLAlchemy session isolation.
+    SqlAlchemyDbSetup {
+        /// List of database bind keys to isolate (None = all binds).
+        databases: Option<Vec<String>>,
+    },
     /// pytest-asyncio event loop configuration
     ///
     /// Parsed from @pytest.mark.asyncio(loop_scope="module") or
@@ -1082,4 +1088,21 @@ mod tests {
             _ => panic!("Wrong variant"),
         }
     }
+
+    #[test]
+    fn test_sqlalchemy_db_setup_effect_serializes() {
+        let effect = HookEffect::SqlAlchemyDbSetup {
+            databases: Some(vec!["default".to_string()]),
+        };
+        let json = serde_json::to_string(&effect).unwrap();
+        assert!(json.contains("SqlAlchemyDbSetup"));
+        assert!(json.contains("default"));
+    }
+
+    #[test]
+    fn test_sqlalchemy_db_setup_effect_none_databases() {
+        let effect = HookEffect::SqlAlchemyDbSetup { databases: None };
+        let json = serde_json::to_string(&effect).unwrap();
+        assert!(json.contains("SqlAlchemyDbSetup"));
+    }
 }