React to some obsoletions and renames in Npgsql

npgsql · Nov 20, 2023 · 4738bab · 4738bab
1 parent 9bbb19d
commit 4738bab
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/BuiltInDataTypesNpgsqlTest.cs
@@ -110,8 +110,11 @@ public virtual void Can_query_using_any_mapped_data_type()
                     PhysicalAddressArrayAsMacaddrArray =
                         new[] { PhysicalAddress.Parse("08-00-2B-01-02-03"), PhysicalAddress.Parse("08-00-2B-01-02-04") },
                     UintAsXid = (uint)int.MaxValue + 1,
+
+#pragma warning disable CS0618 // Full-text search client-parsing is obsolete
                     SearchQuery = NpgsqlTsQuery.Parse("a & b"),
                     SearchVector = NpgsqlTsVector.Parse("a b"),
+#pragma warning restore CS0618
                     RankingNormalization = NpgsqlTsRankingNormalization.DivideByLength,
                     Regconfig = 12724,
                     Mood = Mood.Sad
@@ -264,11 +267,13 @@ public virtual void Can_query_using_any_mapped_data_type()
             var param37 = (uint)int.MaxValue + 1;
             Assert.Same(entity, context.Set<MappedNullableDataTypes>().Single(e => e.Int == 999 && e.UintAsXid == param37));
 
+#pragma warning disable CS0618 // Full-text search client-parsing is obsolete
             var param38 = NpgsqlTsQuery.Parse("a & b");
             Assert.Same(entity, context.Set<MappedNullableDataTypes>().Single(e => e.Int == 999 && e.SearchQuery == param38));
 
             var param39 = NpgsqlTsVector.Parse("a b");
             Assert.Same(entity, context.Set<MappedNullableDataTypes>().Single(e => e.Int == 999 && e.SearchVector == param39));
+#pragma warning restore CS0618
 
             // ReSharper disable once ConvertToConstant.Local
             var param40 = NpgsqlTsRankingNormalization.DivideByLength;
@@ -571,8 +576,10 @@ private static void AssertMappedDataTypes(MappedDataTypes entity, int id)
 
         Assert.Equal((uint)int.MaxValue + 1, entity.UintAsXid);
 
+#pragma warning disable CS0618 // Full-text search client-parsing is obsolete
         Assert.Equal(NpgsqlTsQuery.Parse("a & b").ToString(), entity.SearchQuery.ToString());
         Assert.Equal(NpgsqlTsVector.Parse("a b").ToString(), entity.SearchVector.ToString());
+#pragma warning restore CS0618
         Assert.Equal(NpgsqlTsRankingNormalization.DivideByLength, entity.RankingNormalization);
     }
 
@@ -620,8 +627,10 @@ private static MappedDataTypes CreateMappedDataTypes(int id)
             PhysicalAddressArrayAsMacaddrArray =
                 new[] { PhysicalAddress.Parse("08-00-2B-01-02-03"), PhysicalAddress.Parse("08-00-2B-01-02-04") },
             UintAsXid = (uint)int.MaxValue + 1,
+#pragma warning disable CS0618 // Full-text search client-parsing is obsolete
             SearchQuery = NpgsqlTsQuery.Parse("a & b"),
             SearchVector = NpgsqlTsVector.Parse("a b"),
+#pragma warning restore CS0618
             RankingNormalization = NpgsqlTsRankingNormalization.DivideByLength,
             Regconfig = 12724,
             Mood = Mood.Sad

diff --git a/test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs
@@ -3,6 +3,8 @@
 
 namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query;
 
+#pragma warning disable CS0618 // NpgsqlTsVector.Parse is obsolete
+
 public class FullTextSearchDbFunctionsNpgsqlTest : IClassFixture<NorthwindQueryNpgsqlFixture<NoopModelCustomizer>>
 {
     protected NorthwindQueryNpgsqlFixture<NoopModelCustomizer> Fixture { get; }

diff --git a/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/JsonPocoQueryTest.cs
@@ -853,7 +853,7 @@ static JsonPocoQueryFixture()
         {
             // TODO: Switch to using NpgsqlDataSource
 #pragma warning disable CS0618 // Type or member is obsolete
-            NpgsqlConnection.GlobalTypeMapper.EnableDynamicJsonMappings();
+            NpgsqlConnection.GlobalTypeMapper.EnableDynamicJson();
 #pragma warning restore CS0618 // Type or member is obsolete
         }
 

diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlNorthwindTestStoreFactory.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/NpgsqlNorthwindTestStoreFactory.cs
@@ -10,7 +10,7 @@ static NpgsqlNorthwindTestStoreFactory()
     {
         // TODO: Switch to using NpgsqlDataSource
 #pragma warning disable CS0618 // Type or member is obsolete
-        NpgsqlConnection.GlobalTypeMapper.EnableDynamicJsonMappings();
+        NpgsqlConnection.GlobalTypeMapper.EnableDynamicJson();
         NpgsqlConnection.GlobalTypeMapper.EnableRecordsAsTuples();
 #pragma warning restore CS0618 // Type or member is obsolete
     }

diff --git a/test/EFCore.PG.Tests/Storage/NpgsqlTypeMappingTest.cs b/test/EFCore.PG.Tests/Storage/NpgsqlTypeMappingTest.cs
@@ -813,6 +813,7 @@ public void GenerateCodeLiteral_returns_multirange_empty_array_literal()
 
     #region Full text search
 
+#pragma warning disable CS0618 // Full-text search client-parsing is obsolete
     [Fact]
     public void GenerateSqlLiteral_returns_tsquery_literal()
         => Assert.Equal(
@@ -824,6 +825,7 @@ public void GenerateSqlLiteral_returns_tsvector_literal()
         => Assert.Equal(
             @"TSVECTOR '''a'' ''b'''",
             GetMapping("tsvector").GenerateSqlLiteral(NpgsqlTsVector.Parse("a b")));
+#pragma warning restore CS0618
 
     [Fact]
     public void GenerateSqlLiteral_returns_ranking_normalization_literal()