Additional tests and clearer fixtures

Author: ptiurin

tests/integration/dbapi/async/V2/test_queries_async.py

@@ -816,3 +816,38 @@ async def test_transaction_rollback(
         await c.execute('SELECT * FROM "test_tbl" WHERE id = 1')
         data = await c.fetchall()
         assert len(data) == 0, "Rolled back data should not be present"
+
+
+async def test_transaction_cursor_isolation(
+    connection: Connection, create_drop_test_table_setup_teardown_async: Callable
+) -> None:
+    """Test that one cursor can't see another's data until it commits."""
+    cursor1 = connection.cursor()
+    cursor2 = connection.cursor()
+
+    # Start transaction in cursor1 and insert data
+    result = await cursor1.execute("BEGIN TRANSACTION")
+    assert result == 0, "BEGIN TRANSACTION should return 0 rows"
+
+    await cursor1.execute("INSERT INTO \"test_tbl\" VALUES (1, 'isolated_data')")
+
+    # Verify cursor1 can see its own uncommitted data
+    await cursor1.execute('SELECT * FROM "test_tbl" WHERE id = 1')
+    data1 = await cursor1.fetchall()
+    assert len(data1) == 1, "Cursor1 should see its own uncommitted data"
+    assert data1[0] == [1, "isolated_data"], "Cursor1 data should match inserted values"
+
+    # Verify cursor2 cannot see cursor1's uncommitted data
+    await cursor2.execute('SELECT * FROM "test_tbl" WHERE id = 1')
+    data2 = await cursor2.fetchall()
+    assert len(data2) == 0, "Cursor2 should not see cursor1's uncommitted data"
+
+    # Commit the transaction in cursor1
+    result = await cursor1.execute("COMMIT TRANSACTION")
+    assert result == 0, "COMMIT TRANSACTION should return 0 rows"
+
+    # Now cursor2 should be able to see the committed data
+    await cursor2.execute('SELECT * FROM "test_tbl" WHERE id = 1')
+    data2 = await cursor2.fetchall()
+    assert len(data2) == 1, "Cursor2 should see committed data after commit"
+    assert data2[0] == [1, "isolated_data"], "Cursor2 should see the committed data"

tests/integration/dbapi/sync/V2/test_queries.py

@@ -817,3 +817,38 @@ def test_transaction_rollback(
         c.execute('SELECT * FROM "test_tbl" WHERE id = 1')
         data = c.fetchall()
         assert len(data) == 0, "Rolled back data should not be present"
+
+
+def test_transaction_cursor_isolation(
+    connection: Connection, create_drop_test_table_setup_teardown: Callable
+) -> None:
+    """Test that one cursor can't see another's data until it commits."""
+    cursor1 = connection.cursor()
+    cursor2 = connection.cursor()
+
+    # Start transaction in cursor1 and insert data
+    result = cursor1.execute("BEGIN TRANSACTION")
+    assert result == 0, "BEGIN TRANSACTION should return 0 rows"
+
+    cursor1.execute("INSERT INTO \"test_tbl\" VALUES (1, 'isolated_data')")
+
+    # Verify cursor1 can see its own uncommitted data
+    cursor1.execute('SELECT * FROM "test_tbl" WHERE id = 1')
+    data1 = cursor1.fetchall()
+    assert len(data1) == 1, "Cursor1 should see its own uncommitted data"
+    assert data1[0] == [1, "isolated_data"], "Cursor1 data should match inserted values"
+
+    # Verify cursor2 cannot see cursor1's uncommitted data
+    cursor2.execute('SELECT * FROM "test_tbl" WHERE id = 1')
+    data2 = cursor2.fetchall()
+    assert len(data2) == 0, "Cursor2 should not see cursor1's uncommitted data"
+
+    # Commit the transaction in cursor1
+    result = cursor1.execute("COMMIT TRANSACTION")
+    assert result == 0, "COMMIT TRANSACTION should return 0 rows"
+
+    # Now cursor2 should be able to see the committed data
+    cursor2.execute('SELECT * FROM "test_tbl" WHERE id = 1')
+    data2 = cursor2.fetchall()
+    assert len(data2) == 1, "Cursor2 should see committed data after commit"
+    assert data2[0] == [1, "isolated_data"], "Cursor2 should see the committed data"

tests/unit/db_conftest.py

@@ -261,7 +261,14 @@ def do_query(request: Request, **kwargs) -> Response:
 
 
 @fixture
-def query_callback_with_remove_header(query_statistics: Dict[str, Any]) -> Callable:
+def remove_parameters() -> List[str]:
+    return ["param1", "param3"]
+
+
+@fixture
+def query_callback_with_remove_header(
+    query_statistics: Dict[str, Any], remove_parameters: List[str]
+) -> Callable:
     """Fixture for query callback that returns REMOVE_PARAMETERS_HEADER.
 
     Returns a callback that simulates a server response with Firebolt-Remove-Parameters
@@ -278,7 +285,7 @@ def do_query(request: Request, **kwargs) -> Response:
             "statistics": query_statistics,
         }
         # Header with comma-separated parameter names to remove
-        headers = {"Firebolt-Remove-Parameters": "param1,param3"}
+        headers = {"Firebolt-Remove-Parameters": ",".join(remove_parameters)}
         return Response(status_code=codes.OK, json=query_response, headers=headers)
 
     return do_query