Skip to content

[TINY] Switch to using SqlDbType.Json #36397

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
Jul 21, 2025
Merged

[TINY] Switch to using SqlDbType.Json #36397

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
3 changes: 1 addition & 2 deletions src/EFCore.SqlServer/Storage/Internal/SqlServerOwnedJsonTypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ protected override void ConfigureParameter(DbParameter parameter)
if (StoreType == "json"
&& parameter is SqlParameter sqlParameter) // To avoid crashing wrapping providers
{
// TODO:SQLJSON Issue #34414
sqlParameter.SqlDbType = ((SqlDbType)35);
sqlParameter.SqlDbType = SqlDbType.Json;
}

base.ConfigureParameter(parameter);
Expand Down
6 changes: 2 additions & 4 deletions src/EFCore.SqlServer/Storage/Internal/SqlServerStringTypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ public class SqlServerStringTypeMapping : StringTypeMapping
/// any release. You should only use it directly in your code with extreme caution and knowing that
/// doing so can result in application failures when updating to a new Entity Framework Core release.
/// </summary>
// TODO:SQLJSON Issue #34414
public static SqlServerStringTypeMapping JsonTypeDefault { get; } = new("json", sqlDbType: (SqlDbType)35);
public static SqlServerStringTypeMapping JsonTypeDefault { get; } = new("json", sqlDbType: SqlDbType.Json);

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
Expand Down Expand Up @@ -158,9 +157,8 @@ protected override void ConfigureParameter(DbParameter parameter)
var value = parameter.Value;
var length = (value as string)?.Length;

// TODO:SQLJSON Issue #34414
var sqlDbType = _sqlDbType
?? (StoreType == "json" ? (SqlDbType)35 : null);
?? (StoreType == "json" ? SqlDbType.Json : null);

if (sqlDbType.HasValue
&& parameter is SqlParameter sqlParameter) // To avoid crashing wrapping providers
Expand Down
29 changes: 27 additions & 2 deletions test/EFCore.SqlServer.FunctionalTests/TestUtilities/TestEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public static class TestEnvironment

private static bool? _supportsJsonPathExpressions;

private static bool? _isJsonTypeSupported;

private static bool? _isVectorTypeSupported;

private static bool? _supportsFunctions2017;
Expand Down Expand Up @@ -400,9 +402,32 @@ public static bool IsFunctions2022Supported
}
}

// TODO:SQLJSON Issue #34414
public static bool IsJsonTypeSupported
=> false;
{
get
{
if (!IsConfigured)
{
return false;
}

if (_isJsonTypeSupported.HasValue)
{
return _isJsonTypeSupported.Value;
}

try
{
_isJsonTypeSupported = GetProductMajorVersion() >= 17 || IsSqlAzure;
}
catch (PlatformNotSupportedException)
{
_isJsonTypeSupported = false;
}

return _isJsonTypeSupported.Value;
}
}

public static bool IsVectorTypeSupported
{
Expand Down