From 92d8a2701e0b4a38129159039fc5655550f53b7e Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Tue, 20 Oct 2026 14:10:57 +0200 Subject: [PATCH] [10.0] Translate ToString() on string expressions Backport #4047 (5374dda9c248739b4c7665a684bac05cff94ae53) with its regression coverage. Adapt test paths and the EF 10 element sorter nullable annotation. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: b3737668-7ab2-46a4-9dcb-53e88f145a02 --- .../NpgsqlObjectToStringTranslator.cs | 5 ++ .../Query/GearsOfWarQueryNpgsqlTest.cs | 11 +++ .../Query/TPCGearsOfWarQueryNpgsqlTest.cs | 11 +++ .../Query/TPTGearsOfWarQueryNpgsqlTest.cs | 11 +++ .../StringTranslationsNpgsqlTest.cs | 69 +++++++++++++++++++ 5 files changed, 107 insertions(+) diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlObjectToStringTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlObjectToStringTranslator.cs index 2a98b58ae5..e621199d0a 100644 --- a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlObjectToStringTranslator.cs +++ b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlObjectToStringTranslator.cs @@ -65,6 +65,11 @@ public NpgsqlObjectToStringTranslator(IRelationalTypeMappingSource typeMappingSo return null; } + if (instance.TypeMapping?.ClrType == typeof(string)) + { + return instance; + } + if (instance.Type == typeof(bool)) { if (instance.Type == typeof(bool)) diff --git a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs index 18bfe6e090..c2bcd55f8d 100644 --- a/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/GearsOfWarQueryNpgsqlTest.cs @@ -13,6 +13,17 @@ public GearsOfWarQueryNpgsqlTest(GearsOfWarQueryNpgsqlFixture fixture, ITestOutp Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } + public override async Task ToString_string_property_projection(bool async) + { + await base.ToString_string_property_projection(async); + + AssertSql( + """ +SELECT w."Name" +FROM "Weapons" AS w +"""); + } + #region Byte array public override async Task Byte_array_filter_by_length_literal_does_not_cast_on_varbinary_n(bool async) diff --git a/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs index 0ada4522f5..4d53947e8f 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPCGearsOfWarQueryNpgsqlTest.cs @@ -11,6 +11,17 @@ public TPCGearsOfWarQueryNpgsqlTest(TPCGearsOfWarQueryNpgsqlFixture fixture, ITe Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper); } + public override async Task ToString_string_property_projection(bool async) + { + await base.ToString_string_property_projection(async); + + AssertSql( + """ +SELECT w."Name" +FROM "Weapons" AS w +"""); + } + // Base implementation uses DateTimeOffset.Now, which we don't translate by design. Use DateTimeOffset.UtcNow instead. public override async Task Select_datetimeoffset_comparison_in_projection(bool async) { diff --git a/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs index ae01851071..a79915a4f2 100644 --- a/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/TPTGearsOfWarQueryNpgsqlTest.cs @@ -15,6 +15,17 @@ public TPTGearsOfWarQueryNpgsqlTest(TPTGearsOfWarQueryNpgsqlFixture fixture, ITe // TODO: #1232 // protected override bool CanExecuteQueryString => true; + public override async Task ToString_string_property_projection(bool async) + { + await base.ToString_string_property_projection(async); + + AssertSql( + """ +SELECT w."Name" +FROM "Weapons" AS w +"""); + } + // Base implementation uses DateTimeOffset.Now, which we don't translate by design. Use DateTimeOffset.UtcNow instead. public override async Task Select_datetimeoffset_comparison_in_projection(bool async) { diff --git a/test/EFCore.PG.FunctionalTests/Query/Translations/StringTranslationsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/Translations/StringTranslationsNpgsqlTest.cs index 2ebc6fb97b..f31db77b70 100644 --- a/test/EFCore.PG.FunctionalTests/Query/Translations/StringTranslationsNpgsqlTest.cs +++ b/test/EFCore.PG.FunctionalTests/Query/Translations/StringTranslationsNpgsqlTest.cs @@ -115,6 +115,75 @@ SELECT lower(b."String") """); } + [ConditionalFact] + public async Task ToString_on_string() + { + await AssertQuery( + ss => ss.Set().Where(b => b.String.ToString() == "Seattle").Select(b => b.String)); + + AssertSql( + """ +SELECT b."String" +FROM "BasicTypesEntities" AS b +WHERE b."String" = 'Seattle' +"""); + } + + [ConditionalFact] + public async Task ToString_on_nullable_string() + { + await AssertQuery( + ss => ss.Set().Where(b => b.String!.ToString() == null).Select(b => b.Id), + ss => ss.Set().Where(b => b.String == null).Select(b => b.Id)); + + AssertSql( + """ +SELECT n."Id" +FROM "NullableBasicTypesEntities" AS n +WHERE n."String" IS NULL +"""); + } + + [ConditionalFact] + public async Task ToString_on_object_typed_string_grouping_key_order_by() + { + await AssertQuery( + ss => ss.Set() + .Where(b => b.String == "Seattle" || b.String == "Berlin") + .GroupBy(b => (object)b.String) + .Select(g => new { Key = g.Key.ToString(), Count = g.Count() }) + .OrderBy(g => g.Key), + assertOrder: true); + + AssertSql( + """ +SELECT b."String", count(*)::int +FROM "BasicTypesEntities" AS b +WHERE b."String" IN ('Seattle', 'Berlin') +GROUP BY b."String" +ORDER BY b."String" NULLS FIRST +"""); + } + + [ConditionalFact] + public async Task ToString_on_object_typed_string_grouping_key_where() + { + await AssertQuery( + ss => ss.Set() + .GroupBy(b => (object)b.String) + .Select(g => new { Key = g.Key.ToString(), Count = g.Count() }) + .Where(g => g.Key == "Seattle"), + elementSorter: g => g.Key!); + + AssertSql( + """ +SELECT b."String", count(*)::int +FROM "BasicTypesEntities" AS b +GROUP BY b."String" +HAVING b."String" = 'Seattle' +"""); + } + #endregion Miscellaneous #region IndexOf