From 7dac35f515d62759091748e202db87b0758bb108 Mon Sep 17 00:00:00 2001
From: iatsuta <terraghost@mail.ru>
Date: Thu, 5 Feb 2026 12:33:45 +0100
Subject: [PATCH] upd GenericQueryableSetup

---
 .../AppFetchRuleExpander.cs                               | 8 ++++++++
 src/GenericQueryable.IntegrationTests/MainTests.cs        | 5 +++--
 .../DependencyInjection/GenericQueryableSetup.cs          | 2 +-
 src/__SolutionItems/CommonAssemblyInfo.cs                 | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 src/GenericQueryable.IntegrationTests/AppFetchRuleExpander.cs

diff --git a/src/GenericQueryable.IntegrationTests/AppFetchRuleExpander.cs b/src/GenericQueryable.IntegrationTests/AppFetchRuleExpander.cs
new file mode 100644
index 0000000..edaddd2
--- /dev/null
+++ b/src/GenericQueryable.IntegrationTests/AppFetchRuleExpander.cs
@@ -0,0 +1,8 @@
+using GenericQueryable.Fetching;
+
+namespace GenericQueryable.IntegrationTests;
+
+public class AppFetchRuleExpander : IFetchRuleExpander
+{
+    public PropertyFetchRule<TSource>? TryExpand<TSource>(FetchRule<TSource> fetchRule) => null;
+}
\ No newline at end of file
diff --git a/src/GenericQueryable.IntegrationTests/MainTests.cs b/src/GenericQueryable.IntegrationTests/MainTests.cs
index c803727..637c1c1 100644
--- a/src/GenericQueryable.IntegrationTests/MainTests.cs
+++ b/src/GenericQueryable.IntegrationTests/MainTests.cs
@@ -20,8 +20,9 @@ public async Task DefaultGenericQueryable_InvokeToListAsync_MethodInvoked()
         var sp = new ServiceCollection()
             .AddDbContext<TestDbContext>(optionsBuilder => optionsBuilder
                     .UseSqlite("Data Source=test.db")
-                    .UseGenericQueryable(b =>
-                        b.AddFetchRule(AppFetchRule.TestFetchRule, FetchRule<TestObject>.Create(v => v.DeepFetchObjects).ThenFetch(v => v.FetchObject))),
+                    .UseGenericQueryable(b => b
+                        .AddFetchRuleExpander<AppFetchRuleExpander>()
+                        .AddFetchRule(AppFetchRule.TestFetchRule, FetchRule<TestObject>.Create(v => v.DeepFetchObjects).ThenFetch(v => v.FetchObject))),
                 contextLifetime: ServiceLifetime.Singleton,
                 optionsLifetime: ServiceLifetime.Singleton)
             .AddValidator<DuplicateServiceUsageValidator>()
diff --git a/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs b/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs
index 6c0b51e..dc00a54 100644
--- a/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs
+++ b/src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs
@@ -20,7 +20,7 @@ public class GenericQueryableSetup : IGenericQueryableSetup
 
     public void Initialize(IServiceCollection services)
     {
-        if (!services.AlreadyInitialized<IFetchRuleExpander>())
+        if (!services.AlreadyInitialized<IGenericQueryableExecutor>())
         {
             services.TryAddSingleton<IGenericQueryableExecutor, GenericQueryableExecutor>();
             services.TryAddSingleton<IMethodRedirector, MethodRedirector>();
diff --git a/src/__SolutionItems/CommonAssemblyInfo.cs b/src/__SolutionItems/CommonAssemblyInfo.cs
index d3524db..a3d7303 100644
--- a/src/__SolutionItems/CommonAssemblyInfo.cs
+++ b/src/__SolutionItems/CommonAssemblyInfo.cs
@@ -3,7 +3,7 @@
 [assembly: AssemblyProduct("GenericQueryable")]
 [assembly: AssemblyCompany("IvAt")]
 
-[assembly: AssemblyVersion("2.1.8.0")]
+[assembly: AssemblyVersion("2.1.9.0")]
 [assembly: AssemblyInformationalVersion("changes at build")]
 
 #if DEBUG