From b67857ae2273818ccd21d338d4a1547c4677e6b6 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Mon, 23 Sep 2024 17:00:18 +0200 Subject: [PATCH] [#56] AppDbContext: Turn off connection pooling --- Elwig/Helpers/AppDbContext.cs | 2 +- Elwig/Services/MemberService.cs | 3 +++ Tests/E2ETests/Setup.cs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Elwig/Helpers/AppDbContext.cs b/Elwig/Helpers/AppDbContext.cs index 1749688..6073eab 100644 --- a/Elwig/Helpers/AppDbContext.cs +++ b/Elwig/Helpers/AppDbContext.cs @@ -78,7 +78,7 @@ namespace Elwig.Helpers { public bool HasBackendChanged => SavedLastWriteTime != LastWriteTime; public static string? ConnectionStringOverride { get; set; } = null; - public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default"; + public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default; Pooling=False"; private readonly Dictionary>> _memberAreaCommitmentBuckets = []; private readonly Dictionary>> _memberDeliveryBuckets = []; diff --git a/Elwig/Services/MemberService.cs b/Elwig/Services/MemberService.cs index 0bf1495..5a10af9 100644 --- a/Elwig/Services/MemberService.cs +++ b/Elwig/Services/MemberService.cs @@ -171,6 +171,9 @@ namespace Elwig.Services { .GroupBy(d => d.Year) .ToDictionaryAsync(g => g.Key, g => g.Any()); + if (m.MgNr != vm.MgNr) + return; + await App.MainDispatcher.BeginInvoke(() => { var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []); var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []); diff --git a/Tests/E2ETests/Setup.cs b/Tests/E2ETests/Setup.cs index 4c46a60..3988afa 100644 --- a/Tests/E2ETests/Setup.cs +++ b/Tests/E2ETests/Setup.cs @@ -15,7 +15,7 @@ namespace Tests.E2ETests { [OneTimeSetUp] public static async Task SetupDatabase() { if (File.Exists(Utils.TestDatabasePath)) File.Delete(Utils.TestDatabasePath); - using var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{Utils.TestDatabasePath}\"; Mode=ReadWriteCreate; Foreign Keys=True; Cache=Default"); + using var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{Utils.TestDatabasePath}\"; Mode=ReadWriteCreate; Foreign Keys=True; Cache=Default; Pooling=False"); await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Create.sql"); await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Insert.sql"); await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.E2EInsert.sql");