Bump dependencies

React to dotnet/efcore#26652
npgsql · Apr 19, 2022 · 6cb6491 · 6cb6491
1 parent 84e0e03
commit 6cb6491
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 33 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <EFCoreVersion>6.0.1</EFCoreVersion>
+    <EFCoreVersion>6.0.4</EFCoreVersion>
     <MicrosoftExtensionsVersion>6.0.0</MicrosoftExtensionsVersion>
-    <NpgsqlVersion>6.0.3</NpgsqlVersion>
+    <NpgsqlVersion>6.0.4</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
@@ -263,7 +263,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""EnumConvertedToInt"", s.""EnumConvertedToString"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableEnumConvertedToString"", s.""NullableEnumConvertedToStringWithNonNullableLambda"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""Varchar10"", s.""Varchar15""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableText"" = ANY (@__array_0) OR (((s.""NullableText"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override async Task Array_param_Contains_non_nullable_column(bool async)
@@ -328,7 +328,7 @@ public override void Array_param_with_null_Contains_nullable_not_found()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableText"" = ANY (@__array_0) OR (((s.""NullableText"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override void Array_param_with_null_Contains_nullable_not_found_negated()
@@ -344,7 +344,7 @@ public override void Array_param_with_null_Contains_nullable_not_found_negated()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND ((s.""NullableText"" = ANY (@__array_0) IS NOT NULL))) AND ((s.""NullableText"" IS NOT NULL) OR (array_position(@__array_0, NULL) IS NULL))");
+WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND ((s.""NullableText"" = ANY (@__array_0) IS NOT NULL))) AND (((s.""NullableText"" IS NOT NULL)) OR ((array_position(@__array_0, NULL) IS NULL)))");
     }
 
     public override async Task Array_param_Contains_column_with_ToString(bool async)
@@ -430,7 +430,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""EnumConvertedToInt"", s.""EnumConvertedToString"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableEnumConvertedToString"", s.""NullableEnumConvertedToStringWithNonNullableLambda"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""Varchar10"", s.""Varchar15""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableEnumConvertedToString"" = ANY (@__array_0) OR ((s.""NullableEnumConvertedToString"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableEnumConvertedToString"" = ANY (@__array_0) OR (((s.""NullableEnumConvertedToString"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override async Task Array_param_Contains_value_converted_column_nullable_enum_to_string_with_non_nullable_lambda(bool async)
@@ -447,7 +447,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""EnumConvertedToInt"", s.""EnumConvertedToString"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableEnumConvertedToString"", s.""NullableEnumConvertedToStringWithNonNullableLambda"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""Varchar10"", s.""Varchar15""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableEnumConvertedToStringWithNonNullableLambda"" = ANY (@__array_0) OR ((s.""NullableEnumConvertedToStringWithNonNullableLambda"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableEnumConvertedToStringWithNonNullableLambda"" = ANY (@__array_0) OR (((s.""NullableEnumConvertedToStringWithNonNullableLambda"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override async Task Array_column_Contains_value_converted_param(bool async)
@@ -767,4 +767,4 @@ public class ArrayArrayQueryFixture : ArrayQueryFixture
         protected override string StoreName
             => "ArrayQueryTest";
     }
-}
+}
diff --git a/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs
@@ -251,8 +251,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""EnumConvertedToInt"", s.""EnumConvertedToString"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableEnumConvertedToString"", s.""NullableEnumConvertedToStringWithNonNullableLambda"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""Varchar10"", s.""Varchar15""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
-
+WHERE s.""NullableText"" = ANY (@__array_0) OR (((s.""NullableText"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override async Task Array_param_Contains_non_nullable_column(bool async)
@@ -332,7 +331,7 @@ public override void Array_param_with_null_Contains_nullable_not_found()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableText"" = ANY (@__array_0) OR ((s.""NullableText"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableText"" = ANY (@__array_0) OR (((s.""NullableText"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override void Array_param_with_null_Contains_nullable_not_found_negated()
@@ -353,7 +352,7 @@ public override void Array_param_with_null_Contains_nullable_not_found_negated()
 
 SELECT COUNT(*)::INT
 FROM ""SomeEntities"" AS s
-WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND ((s.""NullableText"" = ANY (@__array_0) IS NOT NULL))) AND ((s.""NullableText"" IS NOT NULL) OR (array_position(@__array_0, NULL) IS NULL))");
+WHERE NOT (s.""NullableText"" = ANY (@__array_0) AND ((s.""NullableText"" = ANY (@__array_0) IS NOT NULL))) AND (((s.""NullableText"" IS NOT NULL)) OR ((array_position(@__array_0, NULL) IS NULL)))");
     }
 
     public override async Task Array_param_Contains_column_with_ToString(bool async)
@@ -438,7 +437,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""EnumConvertedToInt"", s.""EnumConvertedToString"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableEnumConvertedToString"", s.""NullableEnumConvertedToStringWithNonNullableLambda"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""Varchar10"", s.""Varchar15""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableEnumConvertedToString"" = ANY (@__array_0) OR ((s.""NullableEnumConvertedToString"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableEnumConvertedToString"" = ANY (@__array_0) OR (((s.""NullableEnumConvertedToString"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override async Task Array_param_Contains_value_converted_column_nullable_enum_to_string_with_non_nullable_lambda(bool async)
@@ -455,7 +454,7 @@ await AssertQuery(
 
 SELECT s.""Id"", s.""ArrayContainerEntityId"", s.""Byte"", s.""ByteArray"", s.""Bytea"", s.""EnumConvertedToInt"", s.""EnumConvertedToString"", s.""IntArray"", s.""IntList"", s.""NonNullableText"", s.""NullableEnumConvertedToString"", s.""NullableEnumConvertedToStringWithNonNullableLambda"", s.""NullableIntArray"", s.""NullableIntList"", s.""NullableStringArray"", s.""NullableStringList"", s.""NullableText"", s.""StringArray"", s.""StringList"", s.""ValueConvertedArray"", s.""ValueConvertedList"", s.""Varchar10"", s.""Varchar15""
 FROM ""SomeEntities"" AS s
-WHERE s.""NullableEnumConvertedToStringWithNonNullableLambda"" = ANY (@__array_0) OR ((s.""NullableEnumConvertedToStringWithNonNullableLambda"" IS NULL) AND (array_position(@__array_0, NULL) IS NOT NULL))");
+WHERE s.""NullableEnumConvertedToStringWithNonNullableLambda"" = ANY (@__array_0) OR (((s.""NullableEnumConvertedToStringWithNonNullableLambda"" IS NULL)) AND ((array_position(@__array_0, NULL) IS NOT NULL)))");
     }
 
     public override async Task Array_column_Contains_value_converted_param(bool async)
@@ -860,4 +859,4 @@ protected override Expression VisitBinary(BinaryExpression node)
             return base.VisitBinary(node);
         }
     }
-}
+}
diff --git a/test/EFCore.PG.FunctionalTests/Query/CitextQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/CitextQueryTest.cs
@@ -33,7 +33,7 @@ public void StartsWith_literal()
         AssertSql(
             @"SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" IS NOT NULL) AND (s.""CaseInsensitiveText"" LIKE 'some%')
+WHERE ((s.""CaseInsensitiveText"" IS NOT NULL)) AND (s.""CaseInsensitiveText"" LIKE 'some%')
 LIMIT 2");
     }
 
@@ -50,7 +50,7 @@ public void StartsWith_param_pattern()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (@__param_0 = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND ((s.""CaseInsensitiveText"" LIKE @__param_0 || '%' ESCAPE '') AND (left(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext)))
+WHERE (@__param_0 = '') OR (((s.""CaseInsensitiveText"" IS NOT NULL)) AND ((s.""CaseInsensitiveText"" LIKE @__param_0 || '%' ESCAPE '') AND (left(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext)))
 LIMIT 2");
     }
 
@@ -67,7 +67,7 @@ public void StartsWith_param_instance()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND ((@__param_0 LIKE s.""CaseInsensitiveText"" || '%' ESCAPE '') AND (left(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext)))
+WHERE (s.""CaseInsensitiveText"" = '') OR (((s.""CaseInsensitiveText"" IS NOT NULL)) AND ((@__param_0 LIKE s.""CaseInsensitiveText"" || '%' ESCAPE '') AND (left(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext)))
 LIMIT 2");
     }
 
@@ -81,7 +81,7 @@ public void EndsWith_literal()
         AssertSql(
             @"SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" IS NOT NULL) AND (s.""CaseInsensitiveText"" LIKE '%sometext')
+WHERE ((s.""CaseInsensitiveText"" IS NOT NULL)) AND (s.""CaseInsensitiveText"" LIKE '%sometext')
 LIMIT 2");
     }
 
@@ -98,7 +98,7 @@ public void EndsWith_param_pattern()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (@__param_0 = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND (right(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext))
+WHERE (@__param_0 = '') OR (((s.""CaseInsensitiveText"" IS NOT NULL)) AND (right(s.""CaseInsensitiveText"", length(@__param_0))::citext = @__param_0::citext))
 LIMIT 2");
     }
 
@@ -115,7 +115,7 @@ public void EndsWith_param_instance()
 
 SELECT s.""Id"", s.""CaseInsensitiveText""
 FROM ""SomeEntities"" AS s
-WHERE (s.""CaseInsensitiveText"" = '') OR ((s.""CaseInsensitiveText"" IS NOT NULL) AND (right(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext))
+WHERE (s.""CaseInsensitiveText"" = '') OR (((s.""CaseInsensitiveText"" IS NOT NULL)) AND (right(@__param_0, length(s.""CaseInsensitiveText""))::citext = s.""CaseInsensitiveText""::citext))
 LIMIT 2");
     }
 
@@ -300,4 +300,4 @@ public class CitextQueryFixture : SharedStoreFixtureBase<CitextQueryContext>
         public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
         protected override void Seed(CitextQueryContext context) => CitextQueryContext.Seed(context);
     }
-}
+}
diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonDomQueryTest.cs
@@ -310,7 +310,7 @@ public void Like()
         AssertSql(
             @"SELECT j.""Id"", j.""CustomerDocument"", j.""CustomerElement""
 FROM ""JsonbEntities"" AS j
-WHERE (j.""CustomerElement""->>'Name' IS NOT NULL) AND (j.""CustomerElement""->>'Name' LIKE 'J%')
+WHERE ((j.""CustomerElement""->>'Name' IS NOT NULL)) AND (j.""CustomerElement""->>'Name' LIKE 'J%')
 LIMIT 2");
     }
 
@@ -618,4 +618,4 @@ public class JsonDomQueryFixture : SharedStoreFixtureBase<JsonDomQueryContext>
     }
 
     #endregion
-}
+}
diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs
@@ -357,7 +357,7 @@ public void Like()
         AssertSql(
             @"SELECT j.""Id"", j.""Customer"", j.""ToplevelArray""
 FROM ""JsonbEntities"" AS j
-WHERE (j.""Customer""->>'Name' IS NOT NULL) AND (j.""Customer""->>'Name' LIKE 'J%')
+WHERE ((j.""Customer""->>'Name' IS NOT NULL)) AND (j.""Customer""->>'Name' LIKE 'J%')
 LIMIT 2");
     }
 
@@ -731,4 +731,4 @@ public class VariousTypes
     }
 
     #endregion
-}
+}
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs
@@ -28,7 +28,7 @@ public override async Task IsNullOrWhiteSpace_in_predicate(bool async)
         AssertSql(
             @"SELECT c.""CustomerID"", c.""Address"", c.""City"", c.""CompanyName"", c.""ContactName"", c.""ContactTitle"", c.""Country"", c.""Fax"", c.""Phone"", c.""PostalCode"", c.""Region""
 FROM ""Customers"" AS c
-WHERE (c.""Region"" IS NULL) OR (btrim(c.""Region"", E' \t\n\r') = '')");
+WHERE ((c.""Region"" IS NULL)) OR (btrim(c.""Region"", E' \t\n\r') = '')");
     }
 
     public override Task Where_math_log_new_base(bool async)
@@ -298,4 +298,4 @@ protected override void ClearLog()
 
     private void AssertContainsSqlFragment(string expectedFragment)
         => Assert.Contains(Fixture.TestSqlLoggerFactory.SqlStatements, s => s.Contains(expectedFragment));
-}
+}
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs
@@ -144,7 +144,7 @@ await AssertQuery(
 
 SELECT c.""CustomerID"", c.""Address"", c.""City"", c.""CompanyName"", c.""ContactName"", c.""ContactTitle"", c.""Country"", c.""Fax"", c.""Phone"", c.""PostalCode"", c.""Region""
 FROM ""Customers"" AS c
-WHERE c.""Region"" = ANY (@__regions_0) OR ((c.""Region"" IS NULL) AND (array_position(@__regions_0, NULL) IS NOT NULL))");
+WHERE c.""Region"" = ANY (@__regions_0) OR (((c.""Region"" IS NULL)) AND ((array_position(@__regions_0, NULL) IS NOT NULL)))");
     }
 
     [ConditionalTheory]
@@ -167,7 +167,7 @@ await AssertQuery(
 
 SELECT c.""CustomerID"", c.""Address"", c.""City"", c.""CompanyName"", c.""ContactName"", c.""ContactTitle"", c.""Country"", c.""Fax"", c.""Phone"", c.""PostalCode"", c.""Region""
 FROM ""Customers"" AS c
-WHERE c.""Region"" = ANY (@__regions_0) OR ((c.""Region"" IS NULL) AND (array_position(@__regions_0, NULL) IS NOT NULL))");
+WHERE c.""Region"" = ANY (@__regions_0) OR (((c.""Region"" IS NULL)) AND ((array_position(@__regions_0, NULL) IS NOT NULL)))");
     }
 
     #endregion Array contains
@@ -286,4 +286,4 @@ private void AssertSql(params string[] expected)
 
     private void AssertContainsSqlFragment(string expectedFragment)
         => Assert.Contains(Fixture.TestSqlLoggerFactory.SqlStatements, s => s.Contains(expectedFragment));
-}
+}
diff --git a/test/EFCore.PG.FunctionalTests/Query/SimpleQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/SimpleQueryNpgsqlTest.cs
@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
@@ -7,4 +8,16 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query;
 public class SimpleQueryNpgsqlTest : SimpleQueryRelationalTestBase
 {
     protected override ITestStoreFactory TestStoreFactory => NpgsqlTestStoreFactory.Instance;
-}
+
+    // Writes DateTime with Kind=Unspecified to timestamptz
+    public override Task SelectMany_where_Select(bool async)
+        => Task.CompletedTask;
+
+    // Writes DateTime with Kind=Unspecified to timestamptz
+    public override Task Subquery_first_member_compared_to_null(bool async)
+        => Task.CompletedTask;
+
+    // https://github.com/dotnet/efcore/pull/27280, fixed for 7.0
+    public override Task Aggregate_over_subquery_in_group_by_projection(bool async)
+        => Task.CompletedTask;
+}
diff --git a/test/EFCore.PG.FunctionalTests/StoreGeneratedNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/StoreGeneratedNpgsqlTest.cs
@@ -116,7 +116,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
 
             modelBuilder.Entity<NonStoreGenDependent>().Property(e => e.HasTemp).HasDefaultValue(777);
 
+            modelBuilder.Entity<CompositePrincipal>().Property(e => e.Id).UseIdentityColumn();
+
             base.OnModelCreating(modelBuilder, context);
         }
     }
-}
+}