Skip to content
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

Jump to bottom

Fix string.Length translation after SqlQuery #33580

Merged
merged 2 commits into from Apr 22, 2024
Merged

Fix string.Length translation after SqlQuery #33580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
329b820
Tests.
cincuranet Apr 20, 2024
f255fdd
Fix implementation.
cincuranet Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/EFCore.Cosmos/Query/Internal/CosmosStringMemberTranslator.cs
View file
Open in desktop
Expand Up @@ -37,11 +37,11 @@ public CosmosStringMemberTranslator(ISqlExpressionFactory sqlExpressionFactory)
IDiagnosticsLogger<DbLoggerCategory.Query> logger)
{
if (member.Name == nameof(string.Length)
&& instance?.Type == typeof(string))
&& member.DeclaringType == typeof(string))
{
return _sqlExpressionFactory.Function(
"LENGTH",
new[] { instance },
new[] { instance! },
returnType);
}

Expand Down
4 changes: 2 additions & 2 deletions src/EFCore.SqlServer/Query/Internal/SqlServerStringMemberTranslator.cs
View file
Open in desktop
Expand Up @@ -39,12 +39,12 @@ public SqlServerStringMemberTranslator(ISqlExpressionFactory sqlExpressionFactor
IDiagnosticsLogger<DbLoggerCategory.Query> logger)
{
if (member.Name == nameof(string.Length)
&& instance?.Type == typeof(string))
&& member.DeclaringType == typeof(string))
{
return _sqlExpressionFactory.Convert(
_sqlExpressionFactory.Function(
"LEN",
new[] { instance },
new[] { instance! },
nullable: true,
argumentsPropagateNullability: new[] { true },
typeof(long)),
Expand Down
4 changes: 2 additions & 2 deletions src/EFCore.Sqlite.Core/Query/Internal/SqliteStringLengthTranslator.cs
View file
Open in desktop
Expand Up @@ -37,11 +37,11 @@ public SqliteStringLengthTranslator(ISqlExpressionFactory sqlExpressionFactory)
MemberInfo member,
Type returnType,
IDiagnosticsLogger<DbLoggerCategory.Query> logger)
=> instance?.Type == typeof(string)
=> member.DeclaringType == typeof(string)
&& member.Name == nameof(string.Length)
? _sqlExpressionFactory.Function(
"length",
new[] { instance },
new[] { instance! },
nullable: true,
argumentsPropagateNullability: new[] { true },
returnType)
Expand Down
36 changes: 36 additions & 0 deletions test/EFCore.Relational.Specification.Tests/Query/SqlQueryTestBase.cs
View file
Open in desktop
Expand Up @@ -1221,6 +1221,42 @@ public virtual void Ad_hoc_type_with_unmapped_property_throws()
() => context.Database.SqlQueryRaw<Person>(NormalizeDelimitersInRawString(@"SELECT * FROM [People]"))).Message);
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task SqlQueryRaw_then_String_Length(bool async)
{
using var context = CreateContext();
var rawQuery = NormalizeDelimitersInRawString("SELECT 'x' AS [Value] FROM [Customers]");
var query = context.Database.SqlQueryRaw<string>(rawQuery).Where(s => s.Length == 0);

if (async)
{
await query.LoadAsync();
}
else
{
query.Load();
}
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task SqlQueryRaw_then_String_ToUpper_String_Length(bool async)
{
using var context = CreateContext();
var rawQuery = NormalizeDelimitersInRawString("SELECT 'x' AS [Value] FROM [Customers]");
var query = context.Database.SqlQueryRaw<string>(rawQuery).Where(s => s.ToUpper().Length == 0);

if (async)
{
await query.LoadAsync();
}
else
{
query.Load();
}
}

protected class Blog
{
public int Id { get; set; }
Expand Down
28 changes: 28 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Query/SqlQuerySqlServerTest.cs
View file
Open in desktop
Expand Up @@ -785,6 +785,34 @@ public override async Task SqlQueryRaw_composed_with_common_table_expression(boo
Assert.Equal(RelationalStrings.FromSqlNonComposable, exception.Message);
}

public override async Task SqlQueryRaw_then_String_Length(bool async)
{
await base.SqlQueryRaw_then_String_Length(async);

AssertSql(
"""
SELECT [s].[Value]
FROM (
SELECT 'x' AS "Value" FROM "Customers"
) AS [s]
WHERE CAST(LEN([s].[Value]) AS int) = 0
""");
}

public override async Task SqlQueryRaw_then_String_ToUpper_String_Length(bool async)
{
await base.SqlQueryRaw_then_String_ToUpper_String_Length(async);

AssertSql(
"""
SELECT [s].[Value]
FROM (
SELECT 'x' AS "Value" FROM "Customers"
) AS [s]
WHERE CAST(LEN(UPPER([s].[Value])) AS int) = 0
""");
}

protected override DbParameter CreateDbParameter(string name, object value)
=> new SqlParameter { ParameterName = name, Value = value };

Expand Down
28 changes: 28 additions & 0 deletions test/EFCore.Sqlite.FunctionalTests/Query/SqlQuerySqliteTest.cs
View file
Open in desktop
Expand Up @@ -79,6 +79,34 @@ public override async Task SqlQueryRaw_composed_with_common_table_expression(boo
""");
}

public override async Task SqlQueryRaw_then_String_Length(bool async)
{
await base.SqlQueryRaw_then_String_Length(async);

AssertSql(
"""
SELECT "s"."Value"
FROM (
SELECT 'x' AS "Value" FROM "Customers"
) AS "s"
WHERE length("s"."Value") = 0
""");
}

public override async Task SqlQueryRaw_then_String_ToUpper_String_Length(bool async)
{
await base.SqlQueryRaw_then_String_ToUpper_String_Length(async);

AssertSql(
"""
SELECT "s"."Value"
FROM (
SELECT 'x' AS "Value" FROM "Customers"
) AS "s"
WHERE length(upper("s"."Value")) = 0
""");
}

protected override DbParameter CreateDbParameter(string name, object value)
=> new SqliteParameter { ParameterName = name, Value = value };

Expand Down