Test fixes for 8.0.x sync

Author: roji

test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs

@@ -0,0 +1,32 @@
+using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
+
+namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query;
+
+public class AdHocComplexTypeQueryNpgsqlTest : AdHocComplexTypeQueryTestBase
+{
+    public override async Task Complex_type_equals_parameter_with_nested_types_with_property_of_same_name()
+    {
+        await base.Complex_type_equals_parameter_with_nested_types_with_property_of_same_name();
+
+        AssertSql(
+            """
+@__entity_equality_container_0_Id='1' (Nullable = true)
+@__entity_equality_container_0_Containee1_Id='2' (Nullable = true)
+@__entity_equality_container_0_Containee2_Id='3' (Nullable = true)
+
+SELECT e."Id", e."ComplexContainer_Id", e."ComplexContainer_Containee1_Id", e."ComplexContainer_Containee2_Id"
+FROM "EntityType" AS e
+WHERE e."ComplexContainer_Id" = @__entity_equality_container_0_Id AND e."ComplexContainer_Containee1_Id" = @__entity_equality_container_0_Containee1_Id AND e."ComplexContainer_Containee2_Id" = @__entity_equality_container_0_Containee2_Id
+LIMIT 2
+""");
+    }
+
+    protected TestSqlLoggerFactory TestSqlLoggerFactory
+        => (TestSqlLoggerFactory)ListLoggerFactory;
+
+    protected void AssertSql(params string[] expected)
+        => TestSqlLoggerFactory.AssertBaseline(expected);
+
+    protected override ITestStoreFactory TestStoreFactory
+        => NpgsqlTestStoreFactory.Instance;
+}

test/EFCore.PG.FunctionalTests/Query/ComplexTypeQueryNpgsqlTest.cs

@@ -230,12 +230,12 @@ public override async Task Complex_type_equals_parameter(bool async)
             """
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road'
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
-@__entity_equality_address_0_Code='US'
-@__entity_equality_address_0_FullName='United States'
+@__entity_equality_address_0_Country_Code='US'
+@__entity_equality_address_0_Country_FullName='United States'
 
 SELECT c."Id", c."Name", c."BillingAddress_AddressLine1", c."BillingAddress_AddressLine2", c."BillingAddress_ZipCode", c."BillingAddress_Country_Code", c."BillingAddress_Country_FullName", c."ShippingAddress_AddressLine1", c."ShippingAddress_AddressLine2", c."ShippingAddress_ZipCode", c."ShippingAddress_Country_Code", c."ShippingAddress_Country_FullName"
 FROM "Customer" AS c
-WHERE c."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND c."ShippingAddress_AddressLine2" IS NULL AND c."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND c."ShippingAddress_Country_Code" = @__entity_equality_address_0_Code AND c."ShippingAddress_Country_FullName" = @__entity_equality_address_0_FullName
+WHERE c."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND c."ShippingAddress_AddressLine2" IS NULL AND c."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND c."ShippingAddress_Country_Code" = @__entity_equality_address_0_Country_Code AND c."ShippingAddress_Country_FullName" = @__entity_equality_address_0_Country_FullName
 """);
     }
 
@@ -261,15 +261,15 @@ public override async Task Contains_over_complex_type(bool async)
             """
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road'
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
-@__entity_equality_address_0_Code='US'
-@__entity_equality_address_0_FullName='United States'
+@__entity_equality_address_0_Country_Code='US'
+@__entity_equality_address_0_Country_FullName='United States'
 
 SELECT c."Id", c."Name", c."BillingAddress_AddressLine1", c."BillingAddress_AddressLine2", c."BillingAddress_ZipCode", c."BillingAddress_Country_Code", c."BillingAddress_Country_FullName", c."ShippingAddress_AddressLine1", c."ShippingAddress_AddressLine2", c."ShippingAddress_ZipCode", c."ShippingAddress_Country_Code", c."ShippingAddress_Country_FullName"
 FROM "Customer" AS c
 WHERE EXISTS (
     SELECT 1
     FROM "Customer" AS c0
-    WHERE c0."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND c0."ShippingAddress_AddressLine2" IS NULL AND c0."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND c0."ShippingAddress_Country_Code" = @__entity_equality_address_0_Code AND c0."ShippingAddress_Country_FullName" = @__entity_equality_address_0_FullName)
+    WHERE c0."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND c0."ShippingAddress_AddressLine2" IS NULL AND c0."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND c0."ShippingAddress_Country_Code" = @__entity_equality_address_0_Country_Code AND c0."ShippingAddress_Country_FullName" = @__entity_equality_address_0_Country_FullName)
 """);
     }
 
@@ -598,12 +598,12 @@ public override async Task Struct_complex_type_equals_parameter(bool async)
             """
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road'
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
-@__entity_equality_address_0_Code='US'
-@__entity_equality_address_0_FullName='United States'
+@__entity_equality_address_0_Country_Code='US'
+@__entity_equality_address_0_Country_FullName='United States'
 
 SELECT v."Id", v."Name", v."BillingAddress_AddressLine1", v."BillingAddress_AddressLine2", v."BillingAddress_ZipCode", v."BillingAddress_Country_Code", v."BillingAddress_Country_FullName", v."ShippingAddress_AddressLine1", v."ShippingAddress_AddressLine2", v."ShippingAddress_ZipCode", v."ShippingAddress_Country_Code", v."ShippingAddress_Country_FullName"
 FROM "ValuedCustomer" AS v
-WHERE v."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND v."ShippingAddress_AddressLine2" IS NULL AND v."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND v."ShippingAddress_Country_Code" = @__entity_equality_address_0_Code AND v."ShippingAddress_Country_FullName" = @__entity_equality_address_0_FullName
+WHERE v."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND v."ShippingAddress_AddressLine2" IS NULL AND v."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND v."ShippingAddress_Country_Code" = @__entity_equality_address_0_Country_Code AND v."ShippingAddress_Country_FullName" = @__entity_equality_address_0_Country_FullName
 """);
     }
 
@@ -622,15 +622,15 @@ public override async Task Contains_over_struct_complex_type(bool async)
             """
 @__entity_equality_address_0_AddressLine1='804 S. Lakeshore Road'
 @__entity_equality_address_0_ZipCode='38654' (Nullable = true)
-@__entity_equality_address_0_Code='US'
-@__entity_equality_address_0_FullName='United States'
+@__entity_equality_address_0_Country_Code='US'
+@__entity_equality_address_0_Country_FullName='United States'
 
 SELECT v."Id", v."Name", v."BillingAddress_AddressLine1", v."BillingAddress_AddressLine2", v."BillingAddress_ZipCode", v."BillingAddress_Country_Code", v."BillingAddress_Country_FullName", v."ShippingAddress_AddressLine1", v."ShippingAddress_AddressLine2", v."ShippingAddress_ZipCode", v."ShippingAddress_Country_Code", v."ShippingAddress_Country_FullName"
 FROM "ValuedCustomer" AS v
 WHERE EXISTS (
     SELECT 1
     FROM "ValuedCustomer" AS v0
-    WHERE v0."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND v0."ShippingAddress_AddressLine2" IS NULL AND v0."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND v0."ShippingAddress_Country_Code" = @__entity_equality_address_0_Code AND v0."ShippingAddress_Country_FullName" = @__entity_equality_address_0_FullName)
+    WHERE v0."ShippingAddress_AddressLine1" = @__entity_equality_address_0_AddressLine1 AND v0."ShippingAddress_AddressLine2" IS NULL AND v0."ShippingAddress_ZipCode" = @__entity_equality_address_0_ZipCode AND v0."ShippingAddress_Country_Code" = @__entity_equality_address_0_Country_Code AND v0."ShippingAddress_Country_FullName" = @__entity_equality_address_0_Country_FullName)
 """);
     }
 
@@ -1014,6 +1014,75 @@ LIMIT 1
 """);
     }
 
+    public override async Task Projecting_property_of_complex_type_using_left_join_with_pushdown(bool async)
+    {
+        await base.Projecting_property_of_complex_type_using_left_join_with_pushdown(async);
+
+        AssertSql(
+            """
+SELECT t."BillingAddress_ZipCode"
+FROM "CustomerGroup" AS c
+LEFT JOIN (
+    SELECT c0."Id", c0."BillingAddress_ZipCode"
+    FROM "Customer" AS c0
+    WHERE c0."Id" > 5
+) AS t ON c."Id" = t."Id"
+""");
+    }
+
+    public override async Task Projecting_complex_from_optional_navigation_using_conditional(bool async)
+    {
+        await base.Projecting_complex_from_optional_navigation_using_conditional(async);
+
+        AssertSql(
+            """
+@__p_0='20'
+
+SELECT t0."ShippingAddress_ZipCode"
+FROM (
+    SELECT DISTINCT t."ShippingAddress_AddressLine1", t."ShippingAddress_AddressLine2", t."ShippingAddress_ZipCode", t."ShippingAddress_Country_Code", t."ShippingAddress_Country_FullName"
+    FROM (
+        SELECT c0."ShippingAddress_AddressLine1", c0."ShippingAddress_AddressLine2", c0."ShippingAddress_ZipCode", c0."ShippingAddress_Country_Code", c0."ShippingAddress_Country_FullName"
+        FROM "CustomerGroup" AS c
+        LEFT JOIN "Customer" AS c0 ON c."OptionalCustomerId" = c0."Id"
+        ORDER BY c0."ShippingAddress_ZipCode" NULLS FIRST
+        LIMIT @__p_0
+    ) AS t
+) AS t0
+""");
+    }
+
+        public override async Task Project_entity_with_complex_type_pushdown_and_then_left_join(bool async)
+    {
+        await base.Project_entity_with_complex_type_pushdown_and_then_left_join(async);
+
+        AssertSql(
+            """
+@__p_0='20'
+@__p_1='30'
+
+SELECT t0."BillingAddress_ZipCode" AS "Zip1", t1."ShippingAddress_ZipCode" AS "Zip2"
+FROM (
+    SELECT DISTINCT t."Id", t."Name", t."BillingAddress_AddressLine1", t."BillingAddress_AddressLine2", t."BillingAddress_ZipCode", t."BillingAddress_Country_Code", t."BillingAddress_Country_FullName", t."ShippingAddress_AddressLine1", t."ShippingAddress_AddressLine2", t."ShippingAddress_ZipCode", t."ShippingAddress_Country_Code", t."ShippingAddress_Country_FullName"
+    FROM (
+        SELECT c."Id", c."Name", c."BillingAddress_AddressLine1", c."BillingAddress_AddressLine2", c."BillingAddress_ZipCode", c."BillingAddress_Country_Code", c."BillingAddress_Country_FullName", c."ShippingAddress_AddressLine1", c."ShippingAddress_AddressLine2", c."ShippingAddress_ZipCode", c."ShippingAddress_Country_Code", c."ShippingAddress_Country_FullName"
+        FROM "Customer" AS c
+        ORDER BY c."Id" NULLS FIRST
+        LIMIT @__p_0
+    ) AS t
+) AS t0
+LEFT JOIN (
+    SELECT DISTINCT t2."Id", t2."Name", t2."BillingAddress_AddressLine1", t2."BillingAddress_AddressLine2", t2."BillingAddress_ZipCode", t2."BillingAddress_Country_Code", t2."BillingAddress_Country_FullName", t2."ShippingAddress_AddressLine1", t2."ShippingAddress_AddressLine2", t2."ShippingAddress_ZipCode", t2."ShippingAddress_Country_Code", t2."ShippingAddress_Country_FullName"
+    FROM (
+        SELECT c0."Id", c0."Name", c0."BillingAddress_AddressLine1", c0."BillingAddress_AddressLine2", c0."BillingAddress_ZipCode", c0."BillingAddress_Country_Code", c0."BillingAddress_Country_FullName", c0."ShippingAddress_AddressLine1", c0."ShippingAddress_AddressLine2", c0."ShippingAddress_ZipCode", c0."ShippingAddress_Country_Code", c0."ShippingAddress_Country_FullName"
+        FROM "Customer" AS c0
+        ORDER BY c0."Id" DESC NULLS LAST
+        LIMIT @__p_1
+    ) AS t2
+) AS t1 ON t0."Id" = t1."Id"
+""");
+    }
+
     public override async Task Same_complex_type_projected_twice_with_pushdown_as_part_of_another_projection(bool async)
     {
         await base.Same_complex_type_projected_twice_with_pushdown_as_part_of_another_projection(async);

test/EFCore.PG.FunctionalTests/Query/PrimitiveCollectionsQueryNpgsqlTest.cs

@@ -596,6 +596,36 @@ WHERE cardinality(p."Ints") = 2
 """);
     }
 
+    public override async Task Column_collection_Count_with_predicate(bool async)
+    {
+        await base.Column_collection_Count_with_predicate(async);
+
+        AssertSql(
+            """
+SELECT p."Id", p."Bool", p."Bools", p."DateTime", p."DateTimes", p."Enum", p."Enums", p."Int", p."Ints", p."NullableInt", p."NullableInts", p."NullableString", p."NullableStrings", p."String", p."Strings"
+FROM "PrimitiveCollectionsEntity" AS p
+WHERE (
+    SELECT count(*)::int
+    FROM unnest(p."Ints") AS i(value)
+    WHERE i.value > 1) = 2
+""");
+    }
+
+    public override async Task Column_collection_Where_Count(bool async)
+    {
+        await base.Column_collection_Where_Count(async);
+
+        AssertSql(
+            """
+SELECT p."Id", p."Bool", p."Bools", p."DateTime", p."DateTimes", p."Enum", p."Enums", p."Int", p."Ints", p."NullableInt", p."NullableInts", p."NullableString", p."NullableStrings", p."String", p."Strings"
+FROM "PrimitiveCollectionsEntity" AS p
+WHERE (
+    SELECT count(*)::int
+    FROM unnest(p."Ints") AS i(value)
+    WHERE i.value > 1) = 2
+""");
+    }
+
     public override async Task Column_collection_index_int(bool async)
     {
         await base.Column_collection_index_int(async);