From 7cf4b944dd5b840aa5bddcbfe9e432917209458f Mon Sep 17 00:00:00 2001 From: Carpenteri1 Date: Mon, 15 Jun 2026 22:59:48 +0200 Subject: [PATCH 1/2] small changes to DbConnectionServices --- .gitignore | 1 + Assets/Db/.gitkeep | 0 Program.cs | 1 - Services/DbConnectionServices.cs | 9 ++------- 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 Assets/Db/.gitkeep diff --git a/.gitignore b/.gitignore index 3290a6b19..51ef8805a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ yarn-error.log *.sublime-workspace Gridly.csproj.lscache Gridly.csproj.user +Gridly.sln.* # Visual Studio Code !.vscode/settings.json diff --git a/Assets/Db/.gitkeep b/Assets/Db/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/Program.cs b/Program.cs index f3c33fb1a..3aaafa6b3 100644 --- a/Program.cs +++ b/Program.cs @@ -3,7 +3,6 @@ using Gridly.Repositories; using Gridly.Services; using Gridly.Data; -using System.Data; var appDirectory = Path.GetDirectoryName(Environment.ProcessPath) ?? AppContext.BaseDirectory; Directory.SetCurrentDirectory(appDirectory); diff --git a/Services/DbConnectionServices.cs b/Services/DbConnectionServices.cs index 5555d8824..9656d8e09 100644 --- a/Services/DbConnectionServices.cs +++ b/Services/DbConnectionServices.cs @@ -14,19 +14,14 @@ public DbConnectionServices(IConfiguration configuration, IHostEnvironment envir { throw new InvalidOperationException("Connection string 'GridlyDb' is missing."); } - + var sqliteBuilder = new SqliteConnectionStringBuilder(configuredConnectionString); - if (!Path.IsPathRooted(sqliteBuilder.DataSource)) - { - sqliteBuilder.DataSource = Path.Combine(environment.ContentRootPath, sqliteBuilder.DataSource); - } - + sqliteBuilder.DataSource = Path.Combine(environment.ContentRootPath, sqliteBuilder.DataSource); var dbDirectory = Path.GetDirectoryName(sqliteBuilder.DataSource); if (!string.IsNullOrWhiteSpace(dbDirectory)) { Directory.CreateDirectory(dbDirectory); } - connectionString = sqliteBuilder.ConnectionString; } From 764d6310ce47c7c9ee4faf0fdc75580ca538d25e Mon Sep 17 00:00:00 2001 From: Carpenteri1 Date: Mon, 15 Jun 2026 23:05:48 +0200 Subject: [PATCH 2/2] IDbConnectionServices now scoped not singleton --- Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Program.cs b/Program.cs index 3aaafa6b3..779f60f7b 100644 --- a/Program.cs +++ b/Program.cs @@ -19,14 +19,14 @@ builder.Services.AddScoped(); builder.Services.AddScoped(sp => - sp.GetRequiredService().CreateConnection()); + sp.GetRequiredService().CreateConnection()); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); -builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton();