themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

feat: Add connectrion string handling to database connection builders

Browse source 
Allows override of default database connection parameters by providing explicit connection strings for SQLite, MySQL, and PostgreSQL, improving configuration flexibility and setup robustness. Includes refactoring path handling and directory creation for SQLite files.
This commit is contained in:
Sakura Akeno Isayeki 2025-05-23 14:39:34 +02:00
parent f2e88cbedc
commit 2fa07303f7
No known key found for this signature in database
GPG key ID: BAB781B71FD2E7E6
1 changed files with 51 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

58
TShockAPI/DB/DbBuilder.cs
View file

@ -1,4 +1,5 @@
using System.Data;
using System;
using System.Data;
using System.Diagnostics;
using System.IO;
using Microsoft.Data.Sqlite;
@ -53,22 +54,39 @@ public sealed class DbBuilder
private SqliteConnection BuildSqliteConnection()
{
string dbFilePath = Path.Combine(_savePath, _config.Settings.SqliteDBPath);
if (Path.GetDirectoryName(dbFilePath) is not { } dbDirPath)
try
{
throw new DirectoryNotFoundException($"The SQLite database path '{dbFilePath}' could not be found.");
// Handle first the connection string, if specified.
if (_config.Settings.SqliteConnectionString is not (null or ""))
{
// Use factory to build the string, the path may be relative.
SqliteConnectionStringBuilder builder = new(_config.Settings.SqliteConnectionString);
builder.DataSource = GetDbFile(builder.DataSource).FullName;
return new(builder.ConnectionString);
}
Directory.CreateDirectory(dbDirPath);
return new($"Data Source={dbFilePath}");
// Fallback to SqliteDBPath setting.
string dbFilePath = GetDbFile(_config.Settings.SqliteDBPath).FullName;
return new($"Data Source={dbFilePath};");
}
catch (SqliteException e)
{
ServerApi.LogWriter.PluginWriteLine(_caller, e.ToString(), TraceLevel.Error);
throw new("Sqlite not setup correctly", e);
}
}
private MySqlConnection BuildMySqlConnection()
{
try
{
// If specified, use the connection string instead of other parameters.
if (_config.Settings.MySqlConnectionString is not (null or ""))
{
MySqlConnectionStringBuilder builder = new(_config.Settings.MySqlConnectionString);
return new(builder.ToString());
}
string[] hostport = _config.Settings.MySqlHost.Split(':');
MySqlConnectionStringBuilder connStrBuilder = new()
@ -93,6 +111,13 @@ public sealed class DbBuilder
{
try
{
// If specified, use the connection string instead of other parameters.
if (_config.Settings.PostgresConnectionString is not (null or ""))
{
NpgsqlConnectionStringBuilder builder = new(_config.Settings.PostgresConnectionString);
return new(builder.ToString());
}
string[] hostport = _config.Settings.PostgresHost.Split(':');
NpgsqlConnectionStringBuilder connStrBuilder = new()
@ -112,4 +137,21 @@ public sealed class DbBuilder
throw new("Postgres not setup correctly", e);
}
}
private FileInfo GetDbFile(string path)
{
FileInfo dbFile = new(Path.IsPathRooted(path) ? path : Path.Combine(_savePath, path));
if (dbFile.Directory is not { } dbDir)
{
throw new DirectoryNotFoundException($"The SQLite database path '{path}' could not be found.");
}
if (!dbDir.Exists)
{
dbDir.Create();
}
return dbFile;
}
}