[7.0 Cherry-pick] Tests | Fix TVP query hint test timeouts against shared Azure SQL DB (#4593)

[cheenamalhotra]

Port of #4593 to release/7.0.

Fixes the TvpQueryHintsTests "Execution Timeout Expired" failures seen in the sqlclient_manual_azure_* legs.

Problem

TvpQueryHintsTests created its table type and stored procedure in the constructor and dropped them in Dispose. xUnit constructs the class once per test, so the 5 tests issued 20 DDL statements against the shared test database. On Azure SQL Database the resulting schema-modification lock contention pushed CREATE/DROP TYPE and CREATE/DROP PROCEDURE past the default 30 second command timeout.

Fix

• Create the type and procedure once per class via an IClassFixture — 20 DDL statements down to 4.
• Raise the command timeout to 120s to absorb the contention that remains.
• Make the fixture exception-safe so a transient failure during setup or teardown cannot orphan the type in the shared database.

The drop guards use TYPE_ID for the user-defined type and OBJECT_ID for the procedure. User-defined types live in sys.types rather than sys.objects, so OBJECT_ID never resolves them — using it there silently skips the drop and leaks the type. Both lookups are parameterized.

Scope note

release/7.0 does not contain the RAII UserDefinedType fixture introduced in #4050, so the OBJECT_ID -> TYPE_ID fixture fix and the fixture parameterization changes from #4593 do not apply to this branch. Its Table/DatabaseUser/ServerLogin fixtures are already parameterized. Only the DDL-volume fix is ported.

release/6.1 and release/6.0 are not affected: they have no TvpQueryHintsTests.cs, and the query-hint scenarios there run inside a single private QueryHintsTest() method in TvpTest.cs that creates the type and procedure once, so there is no DDL amplification.

Validation

Verified against SQL Server 2022:

• All 5 tests pass.
• Zero orphaned QHint types or procedures remain after the run.
• The class runs ~2x faster (131ms -> 64ms) even with no contention.
• Tests added or updated
• Public API changes documented (n/a - test-only change)
• Verified against customer repro
• Ensure no breaking changes introduced

[Copilot]

Pull request overview

Ports the TVP query-hint test timeout fix to release/7.0 by reducing shared Azure SQL DDL contention.

Changes:

• Shares type and procedure setup through a class fixture.
• Raises the command timeout to 120 seconds.
• Adds parameterized existence checks and cleanup handling.

Suppressed comments (2)

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs:107

• The finally blocks guarantee that DropType() is invoked, but not that it succeeds. A timeout or broken connection during either drop can leave the object on the shared database, and Connection.Dispose() immediately removes the only connection available for another cleanup attempt. Since avoiding orphaned objects is the purpose of this fixture, teardown needs best-effort retry/fresh-connection cleanup rather than treating a single failed drop as complete.

                try
                {
                    DropType();
                }
                finally
                {
                    Connection.Dispose();

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ParameterTest/TvpQueryHintsTests.cs:87

• If CREATE TYPE completes on the server but ExecuteNonQuery() then reports a timeout or network error, this catch only disposes the connection. The type is left behind in the shared database—the same ambiguous-completion case this fixture is meant to handle. The outer setup cleanup should attempt the guarded type drop before disposing while preserving the original failure.

            catch
            {
                Connection.Dispose();
                throw;

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.