Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/GenericQueryable.IntegrationTests/AppFetchRuleExpander.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using GenericQueryable.Fetching;

namespace GenericQueryable.IntegrationTests;

public class AppFetchRuleExpander : IFetchRuleExpander
{
public PropertyFetchRule<TSource>? TryExpand<TSource>(FetchRule<TSource> fetchRule) => null;
}
5 changes: 3 additions & 2 deletions src/GenericQueryable.IntegrationTests/MainTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down
2 changes: 1 addition & 1 deletion src/__SolutionItems/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading