fix #5

JoyMoe · Jan 4, 2023 · 2177369 · 2177369
1 parent 17af49d
commit 2177369
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/Packages.props b/Packages.props
@@ -1,9 +1,9 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.1" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="5.0.0" />
-    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="6.0.12" />
+    <PackageReference Update="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.8" />
   </ItemGroup>
 
 </Project>
diff --git a/src/PGroonga.EntityFrameworkCore/Extensions/PGroongaServiceCollectionExtensions.cs b/src/PGroonga.EntityFrameworkCore/Extensions/PGroongaServiceCollectionExtensions.cs
@@ -19,10 +19,8 @@ public static IServiceCollection AddEntityFrameworkPGroonga(
             this IServiceCollection serviceCollection)
         {
             new EntityFrameworkRelationalServicesBuilder(serviceCollection)
-                .TryAddProviderSpecificServices(
-                    x => x
-                        .TryAddSingletonEnumerable<IMethodCallTranslatorPlugin, PGroongaMethodCallTranslatorPlugin>()
-                        .TryAddSingletonEnumerable<IEvaluatableExpressionFilterPlugin, PGroongaEvaluatableExpressionFilterPlugin>());
+               .TryAdd<IMethodCallTranslatorPlugin, PGroongaMethodCallTranslatorPlugin>()
+               .TryAdd<IEvaluatableExpressionFilterPlugin, PGroongaEvaluatableExpressionFilterPlugin>();
 
             return serviceCollection;
         }

diff --git a/src/PGroonga.EntityFrameworkCore/Infrastructure/Internal/PGroongaOptionsExtension.cs b/src/PGroonga.EntityFrameworkCore/Infrastructure/Internal/PGroongaOptionsExtension.cs
@@ -50,7 +50,9 @@ public ExtensionInfo(IDbContextOptionsExtension extension)
 
             public override bool IsDatabaseProvider => false;
 
-            public override long GetServiceProviderHashCode() => 0;
+            public override int  GetServiceProviderHashCode()                                      => 0;
+
+            public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other) => true;
 
             public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
                 => debugInfo["Npgsql:" + nameof(PGroongaDbContextOptionsBuilderExtensions.UsePGroonga)] = "1";

diff --git a/src/PGroonga.EntityFrameworkCore/PGroonga.EntityFrameworkCore.csproj b/src/PGroonga.EntityFrameworkCore/PGroonga.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/...yFrameworkCore/Query/ExpressionTranslators/Internal/PGroongaMethodCallTranslatorPlugin.cs b/...yFrameworkCore/Query/ExpressionTranslators/Internal/PGroongaMethodCallTranslatorPlugin.cs
@@ -63,11 +63,15 @@ public PGroongaMethodCallTranslator(SqlExpressionFactory sqlExpressionFactory, I
             }
 
             _sqlExpressionFactory = sqlExpressionFactory;
-            _boolMapping = typeMappingSource.FindMapping(typeof(bool));
+            _boolMapping          = typeMappingSource.FindMapping(typeof(bool))!;
         }
 
         /// <inheritdoc />
-        public SqlExpression? Translate(SqlExpression instance, MethodInfo method, IReadOnlyList<SqlExpression> arguments, IDiagnosticsLogger<DbLoggerCategory.Query> logger)
+        public virtual SqlExpression? Translate(
+            SqlExpression?                             instance,
+            MethodInfo                                 method,
+            IReadOnlyList<SqlExpression>               arguments,
+            IDiagnosticsLogger<DbLoggerCategory.Query> logger)
         {
             if (method == null)
             {

diff --git a/tests/PGroongaTests/PGroongaTests.csproj b/tests/PGroongaTests/PGroongaTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>