diff --git a/src/HotChocolate/Data/src/Data/Projections/Expressions/Handlers/QueryableProjectionFieldHandler.cs b/src/HotChocolate/Data/src/Data/Projections/Expressions/Handlers/QueryableProjectionFieldHandler.cs index 97b4ba117bb..0b32ac9b43e 100644 --- a/src/HotChocolate/Data/src/Data/Projections/Expressions/Handlers/QueryableProjectionFieldHandler.cs +++ b/src/HotChocolate/Data/src/Data/Projections/Expressions/Handlers/QueryableProjectionFieldHandler.cs @@ -99,9 +99,10 @@ public override bool TryHandleLeave( return true; } + var nullabilityInfo = context.NullabilityInfoContext.Create(propertyInfo); var memberInit = queryableScope.CreateMemberInit(); - if (context.InMemory) + if (context.InMemory && nullabilityInfo.ReadState == NullabilityState.Nullable) { parentScope.Level .Peek() diff --git a/src/HotChocolate/Data/src/Data/Projections/Expressions/QueryableProjectionContext.cs b/src/HotChocolate/Data/src/Data/Projections/Expressions/QueryableProjectionContext.cs index a700222c976..364cd272af4 100644 --- a/src/HotChocolate/Data/src/Data/Projections/Expressions/QueryableProjectionContext.cs +++ b/src/HotChocolate/Data/src/Data/Projections/Expressions/QueryableProjectionContext.cs @@ -1,4 +1,5 @@ using System.Linq.Expressions; +using System.Reflection; using HotChocolate.Resolvers; using HotChocolate.Types; @@ -17,4 +18,6 @@ public QueryableProjectionContext( } public bool InMemory { get; } + + internal NullabilityInfoContext NullabilityInfoContext { get; } = new(); } diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/QueryableProjectionComplexTypeTests.cs b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/QueryableProjectionComplexTypeTests.cs new file mode 100644 index 00000000000..3dad61d2fe2 --- /dev/null +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/QueryableProjectionComplexTypeTests.cs @@ -0,0 +1,60 @@ +using HotChocolate.Execution; +using Microsoft.EntityFrameworkCore; + +namespace HotChocolate.Data.Projections; + +public class QueryableProjectionComplexTypeTests +{ + private static readonly Foo[] s_fooEntities = + [ + new() { Bar = new Bar { Baz = "testatest" } }, + new() { Bar = new Bar { Baz = "testbtest" } } + ]; + + private readonly SchemaCache _cache = new SchemaCache(); + + [Fact] + public async Task Create_Complex_Type() + { + // arrange + var tester = _cache.CreateSchema(s_fooEntities, OnModelCreating); + + // act + var res1 = await tester.ExecuteAsync( + OperationRequestBuilder.New() + .SetDocument( + """ + { + root { + bar { + baz + } + } + } + """) + .Build()); + + // assert + await Snapshot + .Create() + .AddResult(res1) + .MatchAsync(); + } + + private static void OnModelCreating(ModelBuilder modelBuilder) + { + modelBuilder.Entity().ComplexProperty(f => f.Bar); + } + + public class Foo + { + public int Id { get; set; } + + public Bar Bar { get; set; } = null!; + } + + public record Bar + { + public string Baz { get; set; } = null!; + } +} diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionComplexTypeTests.Create_Complex_Type.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionComplexTypeTests.Create_Complex_Type.snap new file mode 100644 index 00000000000..66cdf7062c8 --- /dev/null +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionComplexTypeTests.Create_Complex_Type.snap @@ -0,0 +1,25 @@ +Result: +--------------- +{ + "data": { + "root": [ + { + "bar": { + "baz": "testatest" + } + }, + { + "bar": { + "baz": "testbtest" + } + } + ] + } +} +--------------- + +SQL: +--------------- +SELECT "d"."Bar_Baz" +FROM "Data" AS "d" +--------------- diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap index 31df65122a5..d7ed35e05d9 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap @@ -29,11 +29,11 @@ SQL: --------------- .param set @p 'a' -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" WHERE "f0"."BarString" = @p diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap index b403fe7c1e0..c496c17e127 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap @@ -29,11 +29,11 @@ SQL: --------------- .param set @__p_0 'a' -SELECT 1, "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" WHERE "f0"."BarString" = @__p_0 diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap index 2b9c7406bfc..f3269ee814e 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap @@ -29,11 +29,11 @@ SQL: --------------- .param set @__p_0 'a' -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" WHERE "f0"."BarString" = @__p_0 diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap index 76cb17c504e..0dadf2ac078 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap @@ -31,11 +31,11 @@ SQL: --------------- .param set @p 'a' -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" WHERE "f0"."BarString" = @p diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap index 2ee88513b2e..eea86578144 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap @@ -31,11 +31,11 @@ SQL: --------------- .param set @__p_0 'a' -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" WHERE "f0"."BarString" = @__p_0 diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap index f21777f3f0a..d7399bdfeb1 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionFilterTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap @@ -31,11 +31,11 @@ SQL: --------------- .param set @__p_0 'a' -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" WHERE "f0"."BarString" = @__p_0 diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap index 10f30603053..f66caeb152d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap index f80bf5b52e0..b4014612fa3 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap index 10f30603053..f66caeb152d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap index cf394fbcfa0..7bb5aa1165c 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap index b3631807839..223b0b70297 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap index cf394fbcfa0..7bb5aa1165c 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionHashSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap index 10f30603053..f66caeb152d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap index f80bf5b52e0..b4014612fa3 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap index 10f30603053..f66caeb152d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap index cf394fbcfa0..7bb5aa1165c 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap index b3631807839..223b0b70297 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap index cf394fbcfa0..7bb5aa1165c 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionISetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionInterfaceTypeTests.Create_Interface_Nested.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionInterfaceTypeTests.Create_Interface_Nested.snap index 2876e192124..3ee2adf0cad 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionInterfaceTypeTests.Create_Interface_Nested.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionInterfaceTypeTests.Create_Interface_Nested.snap @@ -22,7 +22,7 @@ Result: SQL: --------------- -SELECT 1, "a"."d" = 'bar', "a"."Name", "a"."BarProp", "a"."d" = 'foo', "a"."FooProp" +SELECT "a"."d" = 'bar', "a"."Name", "a"."BarProp", "a"."d" = 'foo', "a"."FooProp" FROM "Data" AS "d" INNER JOIN "AbstractType" AS "a" ON "d"."NestedId" = "a"."Id" --------------- diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionNestedTests.Create_Object.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionNestedTests.Create_Object.snap index 93608e306d4..d5b59482e49 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionNestedTests.Create_Object.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionNestedTests.Create_Object.snap @@ -20,7 +20,7 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString" +SELECT "f"."BarString" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" --------------- diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap index 10f30603053..f66caeb152d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap index f80bf5b52e0..b4014612fa3 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap index 10f30603053..f66caeb152d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap @@ -34,11 +34,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap index cf394fbcfa0..7bb5aa1165c 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap index b3631807839..223b0b70297 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap index cf394fbcfa0..7bb5aa1165c 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortedSetTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap @@ -36,11 +36,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap index 17e0b237d75..b865dc013e5 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET10_0.snap @@ -58,11 +58,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap index cb8fa3310f0..afbcc6c1b3b 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET8_0.snap @@ -58,11 +58,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap index 17e0b237d75..b865dc013e5 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_DeepFilterObjectTwoProjections_NET9_0.snap @@ -58,11 +58,11 @@ Result: SQL: --------------- -SELECT 1, "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection.snap index adf7ed325a7..f90b85ab008 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection.snap @@ -60,13 +60,13 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" -) AS "t" ON "f"."Id" = "t"."FooId" -ORDER BY "d"."Id", "f"."Id", "t"."BarShort", "t"."Id" +) AS "s" ON "f"."Id" = "s"."FooId" +ORDER BY "d"."Id", "f"."Id", "s"."BarShort", "s"."Id" --------------- diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap index f90b85ab008..a3296bb0e9d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET10_0.snap @@ -60,11 +60,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap index adf7ed325a7..a5b88f4725c 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET8_0.snap @@ -60,11 +60,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "t"."c", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "t"."BarString", "t"."BarShort", "t"."Id", "t"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "t" ON "f"."Id" = "t"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap index f90b85ab008..a3296bb0e9d 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionSortingTests.Create_ListObjectDifferentLevelProjection_NET9_0.snap @@ -60,11 +60,11 @@ Result: SQL: --------------- -SELECT 1, "f"."BarString", "d"."Id", "f"."Id", "s"."c", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" +SELECT "f"."BarString", "d"."Id", "f"."Id", "s"."BarString", "s"."BarShort", "s"."Id", "s"."Id0" FROM "Data" AS "d" INNER JOIN "Foo" AS "f" ON "d"."FooId" = "f"."Id" LEFT JOIN ( - SELECT 1 AS "c", "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" + SELECT "f0"."BarString", "f0"."BarShort", "b"."Id", "f0"."Id" AS "Id0", "b"."FooId" FROM "BarDeep" AS "b" INNER JOIN "FooDeep" AS "f0" ON "b"."FooId1" = "f0"."Id" ) AS "s" ON "f"."Id" = "s"."FooId" diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Nested.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Nested.snap index 60a1884f069..995bf4b6fa2 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Nested.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Nested.snap @@ -20,7 +20,7 @@ Result: SQL: --------------- -SELECT 1, "a"."d" = 'bar', "a"."BarProp", "a"."d" = 'foo', "a"."FooProp" +SELECT "a"."d" = 'bar', "a"."BarProp", "a"."d" = 'foo', "a"."FooProp" FROM "Data" AS "d" INNER JOIN "AbstractType" AS "a" ON "d"."NestedId" = "a"."Id" --------------- diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property.snap index 4a5c9e9cbcb..54abdbb5203 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property.snap @@ -20,7 +20,7 @@ Result: SQL: --------------- -SELECT 1, 1, "i"."FieldModelKey" +SELECT 1, "i"."FieldModelKey" FROM "Data" AS "d" INNER JOIN "InspectionTrigger" AS "i" ON "d"."TriggerId" = "i"."Id" --------------- diff --git a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property_Pagination.snap b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property_Pagination.snap index b86b8d70d48..1d7d796b75b 100644 --- a/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property_Pagination.snap +++ b/src/HotChocolate/Data/test/Data.Projections.SqlServer.Tests/__snapshots__/QueryableProjectionUnionTypeTests.Create_Union_Single_Property_Pagination.snap @@ -22,7 +22,7 @@ Result: SQL: --------------- -SELECT 1, 1, "i"."FieldModelKey" +SELECT 1, "i"."FieldModelKey" FROM "Data" AS "d" INNER JOIN "InspectionTrigger" AS "i" ON "d"."TriggerId" = "i"."Id" ---------------