Skip to content

[rc2] Enable the JSON data type for Azure SQL Database #36739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roji merged 1 commit into from
Sep 10, 2025
Merged

[rc2] Enable the JSON data type for Azure SQL Database #36739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/EFCore.SqlServer/Infrastructure/Internal/SqlServerSingletonOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ public virtual bool SupportsJsonType
=> EngineType switch
{
SqlServerEngineType.SqlServer => SqlServerCompatibilityLevel >= 170,
// TODO: #36460
// At the time of writing, Azure SQL Database does not yet support OPENJSON over the JSON data type.
// This should get reenabled by the time we GA.
SqlServerEngineType.AzureSql => false,
// SqlServerEngineType.AzureSql => AzureSqlCompatibilityLevel >= 170,
SqlServerEngineType.AzureSql => AzureSqlCompatibilityLevel >= 170,
SqlServerEngineType.AzureSynapse => false,
SqlServerEngineType.Unknown => false, // TODO: We shouldn't observe Unknown here, #36477
_ => throw new UnreachableException()
Expand Down
5 changes: 1 addition & 4 deletions src/EFCore.SqlServer/Query/Internal/SqlServerQuerySqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,10 +606,7 @@ protected override Expression VisitJsonScalar(JsonScalarExpression jsonScalarExp
// 3. Can do JSON-specific decoding (e.g. base64 for varbinary)
// Note that RETURNING is only (currently) supported over the json type (not nvarchar(max)).
// Note that we don't need to check the compatibility level - if the json type is being used, then RETURNING is supported.
var useJsonValueReturningClause = !jsonQuery
&& jsonScalarExpression.Json.TypeMapping?.StoreType is "json"
// Temporarily disabling for Azure SQL, which doesn't yet support RETURNING; this should get removed for 10 (see #36460).
&& _sqlServerSingletonOptions.EngineType is not SqlServerEngineType.AzureSql;
var useJsonValueReturningClause = !jsonQuery && jsonScalarExpression.Json.TypeMapping?.StoreType is "json";

// For JSON_VALUE(), if we can use the RETURNING clause, always do that.
// Otherwise, JSON_VALUE always returns nvarchar(4000) (https://learn.microsoft.com/sql/t-sql/functions/json-value-transact-sql),
Expand Down
9 changes: 2 additions & 7 deletions test/EFCore.SqlServer.Tests/Storage/SqlServerTypeMappingSourceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1588,13 +1588,8 @@ public void Json_is_mapped_to_json_type_with_UseAzureSql_by_default()
{
var typeMappingSource = CreateTypeMappingSource(o => o.UseAzureSql());

// TODO: #36460
// At the time of writing, Azure SQL Database does not yet support OPENJSON over the JSON data type.
// This should get reenabled by the time we GA.
Assert.Equal("nvarchar(max)", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType);
Assert.Equal("nvarchar(max)", typeMappingSource.GetMapping(typeof(int[])).StoreType);
// Assert.Equal("json", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType);
// Assert.Equal("json", typeMappingSource.GetMapping(typeof(int[])).StoreType);
Assert.Equal("json", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType);
Assert.Equal("json", typeMappingSource.GetMapping(typeof(int[])).StoreType);
}

[ConditionalFact]
Expand Down
Loading