Shout it out loud! Changing OpenJson to OPENJSON. (#30913)

Author: ajcvickers

src/EFCore.SqlServer/Query/Internal/SqlServerOpenJsonExpression.cs

@@ -59,7 +59,7 @@ public SqlServerOpenJsonExpression(
         SqlExpression jsonExpression,
         SqlExpression? path = null,
         IReadOnlyList<ColumnInfo>? columnInfos = null)
-        : base(alias, "OpenJson", schema: null, builtIn: true, path is null ? new[] { jsonExpression } : new[] { jsonExpression, path })
+        : base(alias, "OPENJSON", schema: null, builtIn: true, path is null ? new[] { jsonExpression } : new[] { jsonExpression, path })
     {
         ColumnInfos = columnInfos;
     }

src/EFCore.SqlServer/Query/Internal/SqlServerQuerySqlGenerator.cs

@@ -483,7 +483,7 @@ protected virtual Expression VisitOpenJsonExpression(SqlServerOpenJsonExpression
 
         // OPENJSON is a regular table-valued function with a special WITH clause at the end
         // Copy-paste from VisitTableValuedFunction, because that appends the 'AS <alias>' but we need to insert WITH before that
-        Sql.Append("OpenJson(");
+        Sql.Append("OPENJSON(");
 
         GenerateList(openJsonExpression.Arguments, e => Visit(e));
 
@@ -502,7 +502,7 @@ protected virtual Expression VisitOpenJsonExpression(SqlServerOpenJsonExpression
                     Sql.Append(", ");
                 }
 
-                Check.DebugAssert(columnInfo.StoreType is not null, "Unset OpenJson column store type");
+                Check.DebugAssert(columnInfo.StoreType is not null, "Unset OPENJSON column store type");
 
                 Sql
                     .Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(columnInfo.Name))

src/EFCore.SqlServer/Query/Internal/SqlServerQueryableMethodTranslatingExpressionVisitor.cs

@@ -124,13 +124,13 @@ protected override ShapedQueryExpression TranslateCollection(
     {
         var elementClrType = sqlExpression.Type.GetSequenceType();
 
-        // Generate the OpenJson function expression, and wrap it in a SelectExpression.
-        // Note that we want to preserve the ordering of the element's, i.e. for the rows coming out of OpenJson to be the same as the
+        // Generate the OPENJSON function expression, and wrap it in a SelectExpression.
+        // Note that we want to preserve the ordering of the element's, i.e. for the rows coming out of OPENJSON to be the same as the
         // element order in the original JSON array.
-        // Unfortunately, OpenJson with an explicit schema (with the WITH clause) doesn't support this; so we use the variant with the
+        // Unfortunately, OPENJSON with an explicit schema (with the WITH clause) doesn't support this; so we use the variant with the
         // default schema, which returns a 'key' column containing the index, and order by that. This also means we need to explicitly
-        // apply a conversion from the values coming out of OpenJson (always NVARCHAR(MAX)) to the required relational store type.
-        var openJsonExpression = new TableValuedFunctionExpression(tableAlias, "OpenJson", new[] { sqlExpression });
+        // apply a conversion from the values coming out of OPENJSON (always NVARCHAR(MAX)) to the required relational store type.
+        var openJsonExpression = new TableValuedFunctionExpression(tableAlias, "OPENJSON", new[] { sqlExpression });
 
         // TODO: When we have metadata to determine if the element is nullable, pass that here to SelectExpression
         var selectExpression = new SelectExpression(
@@ -140,7 +140,7 @@ protected override ShapedQueryExpression TranslateCollection(
         if (elementTypeMapping is { StoreType: not "nvarchar(max)" })
         {
             // For columns (where we know the type mapping), we need to overwrite the projection in order to insert a CAST() to the actual
-            // relational store type we expect out of the JSON array (e.g. OpenJson returns strings, we want datetime2).
+            // relational store type we expect out of the JSON array (e.g. OPENJSON returns strings, we want datetime2).
             // For parameters (where we don't yet know the type mapping), we'll need to do that later, after the type mapping has been
             // inferred.
             // TODO: Need to pass through the type mapping API for converting the JSON value (nvarchar) to the relational store type (e.g.
@@ -164,7 +164,7 @@ protected override ShapedQueryExpression TranslateCollection(
                 });
         }
 
-        // Append an ordering for the OpenJson 'key' column, converting it from nvarchar to int.
+        // Append an ordering for the OPENJSON 'key' column, converting it from nvarchar to int.
         selectExpression.AppendOrdering(
             new OrderingExpression(
             _sqlExpressionFactory.Convert(
@@ -211,7 +211,7 @@ protected override ShapedQueryExpression TranslateCollection(
                 [
                     TableValuedFunctionExpression
                     {
-                        Name: "OpenJson", Schema: null, IsBuiltIn: true, Arguments: [var jsonArrayColumn]
+                        Name: "OPENJSON", Schema: null, IsBuiltIn: true, Arguments: [var jsonArrayColumn]
                     } openJsonExpression
                 ],
                 GroupBy: [],
@@ -246,7 +246,7 @@ protected override ShapedQueryExpression TranslateCollection(
             if (shaperExpression is ProjectionBindingExpression projectionBindingExpression
                 && selectExpression.GetProjection(projectionBindingExpression) is SqlExpression projection)
             {
-                // OpenJson's value column is an nvarchar(max); if this is a collection column whose type mapping is know, the projection
+                // OPENJSON's value column is an nvarchar(max); if this is a collection column whose type mapping is know, the projection
                 // contains a CAST node which we unwrap
                 var projectionColumn = projection switch
                 {
@@ -273,7 +273,7 @@ protected override ShapedQueryExpression TranslateCollection(
                     // If we have a type mapping (i.e. translating over a column rather than a parameter), apply any necessary server-side
                     // conversions.
                     // TODO: This should be part of #30677
-                    // OpenJson's value column has type nvarchar(max); apply a CAST() unless that's the inferred element type mapping
+                    // OPENJSON's value column has type nvarchar(max); apply a CAST() unless that's the inferred element type mapping
                     if (projectionColumn.TypeMapping is { StoreType: not "nvarchar(max)"} typeMapping)
                     {
                         translation = _sqlExpressionFactory.Convert(translation, typeMapping.ClrType, typeMapping);
@@ -440,21 +440,21 @@ protected override Expression VisitExtension(Expression expression)
         {
             switch (expression)
             {
-                case TableValuedFunctionExpression { Name: "OpenJson", Schema: null, IsBuiltIn: true } openJsonExpression
+                case TableValuedFunctionExpression { Name: "OPENJSON", Schema: null, IsBuiltIn: true } openJsonExpression
                     when InferredTypeMappings.TryGetValue((openJsonExpression, "value"), out var typeMapping):
                     return ApplyTypeMappingsOnOpenJsonExpression(openJsonExpression, new[] { typeMapping });
 
-                // Above, we applied the type mapping the the parameter that OpenJson accepts as an argument.
+                // Above, we applied the type mapping the the parameter that OPENJSON accepts as an argument.
                 // But the inferred type mapping also needs to be applied as a SQL conversion on the column projections coming out of the
-                // SelectExpression containing the OpenJson call. So we set state to know about OpenJson tables and their type mappings
+                // SelectExpression containing the OPENJSON call. So we set state to know about OPENJSON tables and their type mappings
                 // in the immediate SelectExpression, and continue visiting down (see ColumnExpression visitation below).
                 case SelectExpression selectExpression:
                 {
                     Dictionary<TableExpressionBase, RelationalTypeMapping>? previousSelectInferredTypeMappings = null;
 
                     foreach (var table in selectExpression.Tables)
                     {
-                        if (table is TableValuedFunctionExpression { Name: "OpenJson", Schema: null, IsBuiltIn: true } openJsonExpression
+                        if (table is TableValuedFunctionExpression { Name: "OPENJSON", Schema: null, IsBuiltIn: true } openJsonExpression
                             && InferredTypeMappings.TryGetValue((openJsonExpression, "value"), out var inferredTypeMapping))
                         {
                             if (previousSelectInferredTypeMappings is null)
@@ -534,7 +534,7 @@ protected virtual TableValuedFunctionExpression ApplyTypeMappingsOnOpenJsonExpre
         /// </summary>
         public virtual SqlExpression ApplyTypeMappingOnColumn(ColumnExpression columnExpression, RelationalTypeMapping typeMapping)
             // TODO: this should be part of #30677
-            // OpenJson's value column has type nvarchar(max); apply a CAST() unless that's the inferred element type mapping
+            // OPENJSON's value column has type nvarchar(max); apply a CAST() unless that's the inferred element type mapping
             => typeMapping.StoreType is "nvarchar(max)"
                 ? columnExpression
                 : _sqlExpressionFactory.Convert(columnExpression, typeMapping.ClrType, typeMapping);

src/EFCore.SqlServer/Storage/Internal/SqlServerTypeMappingSource.cs

@@ -489,7 +489,7 @@ public SqlServerTypeMappingSource(
         stringTypeMapping = (SqlServerStringTypeMapping)stringTypeMapping
             .Clone(new CollectionToJsonStringConverter(mappingInfo.ClrType, elementTypeMapping));
 
-        // OpenJson was introduced in SQL Server 2016 (compatibility level 130). If the user configures an older compatibility level,
+        // OPENJSON was introduced in SQL Server 2016 (compatibility level 130). If the user configures an older compatibility level,
         // we allow mapping the column, but don't set the element type mapping on the mapping, so that it isn't queryable.
         // This causes us to go into the old translation path for Contains over parameter via IN with constants.
         if (_supportsOpenJson)

test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs

@@ -544,7 +544,7 @@ public virtual async Task Parameter_collection_in_subquery_Union_column_collecti
     [ConditionalFact]
     public virtual void Parameter_collection_in_subquery_and_Convert_as_compiled_query()
     {
-        // The array indexing is translated as a subquery over e.g. OpenJson with LIMIT/OFFSET.
+        // The array indexing is translated as a subquery over e.g. OPENJSON with LIMIT/OFFSET.
         // Since there's a CAST over that, the type mapping inference from the other side (p.String) doesn't propagate inside to the
         // subquery. In this case, the CAST operand gets the default CLR type mapping, but that's object in this case.
         // We should apply the default type mapping to the parameter, but need to figure out the exact rules when to do this.

test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs

@@ -1225,7 +1225,7 @@ FROM [LevelOne] AS [l]
 LEFT JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[OneToMany_Required_Inverse3Id]
 WHERE EXISTS (
     SELECT 1
-    FROM OpenJson(@__validIds_0) AS [v]
+    FROM OPENJSON(@__validIds_0) AS [v]
     WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
 ORDER BY [l].[Id], [l0].[Id]
 """);
@@ -2338,7 +2338,7 @@ SELECT [l].[Date]
     FROM [LevelOne] AS [l]
     WHERE EXISTS (
         SELECT 1
-        FROM OpenJson(@__validIds_0) AS [v]
+        FROM OPENJSON(@__validIds_0) AS [v]
         WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
     GROUP BY [l].[Date]
 ) AS [t]
@@ -2347,7 +2347,7 @@ LEFT JOIN (
     FROM [LevelOne] AS [l0]
     WHERE EXISTS (
         SELECT 1
-        FROM OpenJson(@__validIds_0) AS [v0]
+        FROM OPENJSON(@__validIds_0) AS [v0]
         WHERE [v0].[value] = [l0].[Name] OR ([v0].[value] IS NULL AND [l0].[Name] IS NULL))
 ) AS [t0] ON [t].[Date] = [t0].[Date]
 ORDER BY [t].[Date]

test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs

@@ -2876,7 +2876,7 @@ WHEN [t0].[OneToOne_Required_PK_Date] IS NOT NULL AND [t0].[Level1_Required_Id]
 END = [t1].[OneToMany_Required_Inverse3Id]
 WHERE EXISTS (
     SELECT 1
-    FROM OpenJson(@__validIds_0) AS [v]
+    FROM OPENJSON(@__validIds_0) AS [v]
     WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
 ORDER BY [l].[Id], [t0].[Id], [t0].[Id0]
 """);
@@ -3022,7 +3022,7 @@ SELECT [l].[Date]
     FROM [Level1] AS [l]
     WHERE EXISTS (
         SELECT 1
-        FROM OpenJson(@__validIds_0) AS [v]
+        FROM OPENJSON(@__validIds_0) AS [v]
         WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
     GROUP BY [l].[Date]
 ) AS [t]
@@ -3031,7 +3031,7 @@ LEFT JOIN (
     FROM [Level1] AS [l0]
     WHERE EXISTS (
         SELECT 1
-        FROM OpenJson(@__validIds_0) AS [v0]
+        FROM OPENJSON(@__validIds_0) AS [v0]
         WHERE [v0].[value] = [l0].[Name] OR ([v0].[value] IS NULL AND [l0].[Name] IS NULL))
 ) AS [t0] ON [t].[Date] = [t0].[Date]
 ORDER BY [t].[Date]

test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs

@@ -3197,7 +3197,7 @@ FROM [LevelOne] AS [l]
 LEFT JOIN [LevelTwo] AS [l0] ON [l].[Id] = [l0].[Level1_Required_Id]
 WHERE EXISTS (
     SELECT 1
-    FROM OpenJson(@__validIds_0) AS [v]
+    FROM OPENJSON(@__validIds_0) AS [v]
     WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
 ORDER BY [l].[Id], [l0].[Id]
 """,
@@ -3211,7 +3211,7 @@ FROM [LevelOne] AS [l]
 INNER JOIN [LevelThree] AS [l1] ON [l0].[Id] = [l1].[OneToMany_Required_Inverse3Id]
 WHERE EXISTS (
     SELECT 1
-    FROM OpenJson(@__validIds_0) AS [v]
+    FROM OPENJSON(@__validIds_0) AS [v]
     WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
 ORDER BY [l].[Id], [l0].[Id]
 """);
@@ -3750,7 +3750,7 @@ SELECT [l].[Date]
 FROM [LevelOne] AS [l]
 WHERE EXISTS (
     SELECT 1
-    FROM OpenJson(@__validIds_0) AS [v]
+    FROM OPENJSON(@__validIds_0) AS [v]
     WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
 GROUP BY [l].[Date]
 ORDER BY [l].[Date]
@@ -3765,7 +3765,7 @@ SELECT [l].[Date]
     FROM [LevelOne] AS [l]
     WHERE EXISTS (
         SELECT 1
-        FROM OpenJson(@__validIds_0) AS [v]
+        FROM OPENJSON(@__validIds_0) AS [v]
         WHERE [v].[value] = [l].[Name] OR ([v].[value] IS NULL AND [l].[Name] IS NULL))
     GROUP BY [l].[Date]
 ) AS [t]
@@ -3774,7 +3774,7 @@ INNER JOIN (
     FROM [LevelOne] AS [l0]
     WHERE EXISTS (
         SELECT 1
-        FROM OpenJson(@__validIds_0) AS [v0]
+        FROM OPENJSON(@__validIds_0) AS [v0]
         WHERE [v0].[value] = [l0].[Name] OR ([v0].[value] IS NULL AND [l0].[Name] IS NULL))
 ) AS [t0] ON [t].[Date] = [t0].[Date]
 ORDER BY [t].[Date]

test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsQuerySqlServerTest.cs

@@ -3083,7 +3083,7 @@ FROM [LevelOne] AS [l]
 LEFT JOIN [LevelTwo] AS [l0] ON [l].[Id] = [l0].[Level1_Optional_Id]
 WHERE NOT EXISTS (
     SELECT 1
-    FROM OpenJson(@__names_0) AS [n]
+    FROM OPENJSON(@__names_0) AS [n]
     WHERE ([l0].[Name] = [n].[value] AND [l0].[Name] IS NOT NULL AND [n].[value] IS NOT NULL) OR ([l0].[Name] IS NULL AND [n].[value] IS NULL))
 """);
     }

test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsSharedTypeQuerySqlServerTest.cs

@@ -5414,7 +5414,7 @@ WHERE [l0].[OneToOne_Required_PK_Date] IS NOT NULL AND [l0].[Level1_Required_Id]
 ) AS [t] ON [l].[Id] = [t].[Level1_Optional_Id]
 WHERE NOT EXISTS (
     SELECT 1
-    FROM OpenJson(@__names_0) AS [n]
+    FROM OPENJSON(@__names_0) AS [n]
     WHERE ([t].[Level2_Name] = [n].[value] AND [t].[Level2_Name] IS NOT NULL AND [n].[value] IS NOT NULL) OR ([t].[Level2_Name] IS NULL AND [n].[value] IS NULL))
 """);
     }

test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs

@@ -218,7 +218,7 @@ FROM [Gears] AS [g]
 LEFT JOIN [Tags] AS [t] ON [g].[Nickname] = [t].[GearNickName] AND [g].[SquadId] = [t].[GearSquadId]
 WHERE [t].[Id] IS NOT NULL AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__tags_0) AS [t0]
+    FROM OPENJSON(@__tags_0) AS [t0]
     WHERE CAST([t0].[value] AS uniqueidentifier) = [t].[Id] OR ([t0].[value] IS NULL AND [t].[Id] IS NULL))
 """);
     }
@@ -242,7 +242,7 @@ FROM [Gears] AS [g]
 LEFT JOIN [Tags] AS [t] ON [g].[Nickname] = [t].[GearNickName] AND [g].[SquadId] = [t].[GearSquadId]
 WHERE [c].[Location] IS NOT NULL AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__tags_0) AS [t0]
+    FROM OPENJSON(@__tags_0) AS [t0]
     WHERE CAST([t0].[value] AS uniqueidentifier) = [t].[Id] OR ([t0].[value] IS NULL AND [t].[Id] IS NULL))
 """);
     }
@@ -265,7 +265,7 @@ FROM [Gears] AS [g]
 LEFT JOIN [Tags] AS [t] ON [g].[Nickname] = [t].[GearNickName] AND [g].[SquadId] = [t].[GearSquadId]
 WHERE [t].[Id] IS NOT NULL AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__tags_0) AS [t0]
+    FROM OPENJSON(@__tags_0) AS [t0]
     WHERE CAST([t0].[value] AS uniqueidentifier) = [t].[Id] OR ([t0].[value] IS NULL AND [t].[Id] IS NULL))
 """);
     }
@@ -2106,7 +2106,7 @@ public override async Task Non_unicode_string_literals_in_contains_is_used_for_n
 FROM [Cities] AS [c]
 WHERE EXISTS (
     SELECT 1
-    FROM OpenJson(@__cities_0) AS [c0]
+    FROM OPENJSON(@__cities_0) AS [c0]
     WHERE CAST([c0].[value] AS varchar(100)) = [c].[Location] OR ([c0].[value] IS NULL AND [c].[Location] IS NULL))
 """);
     }
@@ -3108,7 +3108,7 @@ public override async Task Contains_with_local_nullable_guid_list_closure(bool a
 FROM [Tags] AS [t]
 WHERE EXISTS (
     SELECT 1
-    FROM OpenJson(@__ids_0) AS [i]
+    FROM OPENJSON(@__ids_0) AS [i]
     WHERE CAST([i].[value] AS uniqueidentifier) = [t].[Id])
 """);
     }
@@ -3632,7 +3632,7 @@ FROM [Gears] AS [g]
 LEFT JOIN [Cities] AS [c] ON [g].[AssignedCityName] = [c].[Name]
 WHERE [g].[SquadId] < 2 AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__cities_0) AS [c0]
+    FROM OPENJSON(@__cities_0) AS [c0]
     WHERE CAST([c0].[value] AS nvarchar(450)) = [c].[Name] OR ([c0].[value] IS NULL AND [c].[Name] IS NULL))
 """);
     }
@@ -5924,7 +5924,7 @@ FROM [Gears] AS [g]
 ORDER BY CASE
     WHEN EXISTS (
         SELECT 1
-        FROM OpenJson(@__nicknames_0) AS [n]
+        FROM OPENJSON(@__nicknames_0) AS [n]
         WHERE CAST([n].[value] AS nvarchar(450)) = [g].[Nickname]) THEN CAST(1 AS bit)
     ELSE CAST(0 AS bit)
 END DESC, [g].[Nickname], [g].[SquadId]
@@ -6669,7 +6669,7 @@ public override async Task DateTimeOffset_Contains_Less_than_Greater_than(bool a
 FROM [Missions] AS [m]
 WHERE @__start_0 <= CAST(CONVERT(date, [m].[Timeline]) AS datetimeoffset) AND [m].[Timeline] < @__end_1 AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__dates_2) AS [d]
+    FROM OPENJSON(@__dates_2) AS [d]
     WHERE CAST([d].[value] AS datetimeoffset) = [m].[Timeline])
 """);
     }
@@ -7384,7 +7384,7 @@ FROM [Gears] AS [g]
 ORDER BY CASE
     WHEN EXISTS (
         SELECT 1
-        FROM OpenJson(@__ids_0) AS [i]
+        FROM OPENJSON(@__ids_0) AS [i]
         WHERE CAST([i].[value] AS int) = [g].[SquadId]) THEN CAST(1 AS bit)
     ELSE CAST(0 AS bit)
 END
@@ -8145,7 +8145,7 @@ FROM [Weapons] AS [w]
 LEFT JOIN [Weapons] AS [w0] ON [w].[SynergyWithId] = [w0].[Id]
 WHERE [w0].[Id] IS NOT NULL AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__types_0) AS [t]
+    FROM OPENJSON(@__types_0) AS [t]
     WHERE CAST([t].[value] AS int) = [w0].[AmmunitionType] OR ([t].[value] IS NULL AND [w0].[AmmunitionType] IS NULL))
 """);
     }
@@ -9381,7 +9381,7 @@ public override async Task Where_bool_column_and_Contains(bool async)
 FROM [Gears] AS [g]
 WHERE [g].[HasSoulPatch] = CAST(1 AS bit) AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__values_0) AS [v]
+    FROM OPENJSON(@__values_0) AS [v]
     WHERE CAST([v].[value] AS bit) = [g].[HasSoulPatch])
 """);
     }
@@ -9398,7 +9398,7 @@ public override async Task Where_bool_column_or_Contains(bool async)
 FROM [Gears] AS [g]
 WHERE [g].[HasSoulPatch] = CAST(1 AS bit) AND EXISTS (
     SELECT 1
-    FROM OpenJson(@__values_0) AS [v]
+    FROM OPENJSON(@__values_0) AS [v]
     WHERE CAST([v].[value] AS bit) = [g].[HasSoulPatch])
 """);
     }
@@ -10118,7 +10118,7 @@ FROM [Gears] AS [g1]
 GROUP BY [s].[Name]
 """);
     }
-    
+
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
 }