[release/8.0] Make Contains work again over hierarchyid

[roji]

Fixes #31912

Description

The primitive collection improvements to 8.0 changed the translation of Contains to use OPENJSON with WITH, but that's incompatible with hierarchyid (SQL Server CLR type).

Customer impact

Queries which apply Contains to a parameter list of HierarchyId no longer work in 8.0.

How found

Customer reported.

Regression

Yes (when the community hierarchyid package was used)

Testing

Added.

Risk

Very low, the mechanism to transform the incompatible OPENJSON with WITH to OPENJSON without WITH already existed for other purposes; this change only extends its usage for hierarchyid.

[ajcvickers]

@roji This is approved by Tactics.

[IT-CASADO]

This is still broken in some use cases. In my case with some .Includes and .AsSplitQuery().

var result = await query
   .Include()
   .AsSplitQuery()       
   .ToListAsync(cancellationToken);

This results to follwoing two queries.

exec sp_executesql N'SELECT [i].[Id], [i].[NodeId]
FROM [Initiative] AS [i]

WHERE [i].[NodeId] IN (
    SELECT CAST([q].[value] AS hierarchyid) AS [value]
    FROM OPENJSON(@__qFiltered_1) AS [q]
)'

,N'@__qFiltered_1 nvarchar(4000)',@__qFiltered_1=N'["/3/1/1/"]'


exec sp_executesql N'SELECT [i].[Id], [i].[NodeId]
FROM [Initiative] AS [i]
INNER JOIN [InitiativeDimensionValue] AS [t] ON [i].[Id] = [t].[InitiativeId]

WHERE [i].[NodeId] IN (
    SELECT [q].[value]
    FROM OPENJSON(@__qFiltered_4) WITH ([value] hierarchyid ''$'') AS [q]         --> this is wrong
)'

,N'@__qFiltered_1 nvarchar(4000)',@__qFiltered_1=N'["/3/1/1/"]'

Unfortunately the second query is still using the WITH syntax.

[roji]

@IT-CASADO can you please open a new issue for this, including a minimal, runnable code sample? Then I can look at fixing that case as well.