Feature/psql mariadb support

Arrowgene.Ddon.Database/Arrowgene.Ddon.Database.csproj

@@ -14,6 +14,8 @@
  <ItemGroup>
  <PackageReference Include="Arrowgene.Logging" Version="1.2.1" />
  <PackageReference Include="System.Data.SQLite" Version="1.0.115.5" />
+ <PackageReference Include="Npgsql" Version="7.0.6" />
+ <PackageReference Include="MySqlConnector" Version="2.2.7" />
  </ItemGroup>
 
  <ItemGroup>

Arrowgene.Ddon.Database/DatabaseSetting.cs

@@ -3,7 +3,6 @@
 using System.Runtime.Serialization;
 using Arrowgene.Ddon.Database.Model;
 using Arrowgene.Ddon.Shared;
-using Arrowgene.Ddon.Shared.Network;
 
 namespace Arrowgene.Ddon.Database
 {
@@ -12,8 +11,8 @@ public class DatabaseSetting
  {
  public DatabaseSetting()
  {
- Type = DatabaseType.SQLite;
- SqLiteFolder = Path.Combine(Util.ExecutingDirectory(), "Files/Database");
+ Type = "sqlite";
+ DatabaseFolder = Path.Combine(Util.ExecutingDirectory(), "Files/Database");
  Host = "localhost";
  Port = 3306;
  Database = "Ddon";
@@ -22,30 +21,51 @@ public DatabaseSetting()
  WipeOnStartup = true;
 
  string envDbType = Environment.GetEnvironmentVariable("DB_TYPE");
- switch (envDbType)
+ if (!string.IsNullOrEmpty(envDbType))
  {
- case "sqlite":
- Type = DatabaseType.SQLite;
- break;
+ Type = envDbType;
+ }
+ string envDbFolder = Environment.GetEnvironmentVariable("DB_FOLDER");
+ if (!string.IsNullOrEmpty(envDbFolder))
+ {
+ DatabaseFolder = envDbFolder;
+ }
+ string envDbHost = Environment.GetEnvironmentVariable("DB_HOST");
+ if (!string.IsNullOrEmpty(envDbHost))
+ {
+ Host = envDbHost;
+ }
+ string envDbPort = Environment.GetEnvironmentVariable("DB_PORT");
+ if (!string.IsNullOrEmpty(envDbPort))
+ {
+ Port = Convert.ToInt16(envDbPort);
+ }
+ string envDbDatabase = Environment.GetEnvironmentVariable("DB_DATABASE");
+ if (!string.IsNullOrEmpty(envDbDatabase))
+ {
+ Database = envDbDatabase;
  }
-
  string envDbUser = Environment.GetEnvironmentVariable("DB_USER");
  if (!string.IsNullOrEmpty(envDbUser))
  {
  User = envDbUser;
  }
-
  string envDbPass = Environment.GetEnvironmentVariable("DB_PASS");
  if (!string.IsNullOrEmpty(envDbPass))
  {
  Password = envDbPass;
  }
+ string envDbWipeOnStartup = Environment.GetEnvironmentVariable("DB_WIPE_ON_STARTUP");
+ if (!string.IsNullOrEmpty(envDbWipeOnStartup))
+ {
+ WipeOnStartup = Convert.ToBoolean(envDbWipeOnStartup);
+ }
  }
 
  public DatabaseSetting(DatabaseSetting databaseSettings)
  {
  Type = databaseSettings.Type;
- SqLiteFolder = databaseSettings.SqLiteFolder;
+ DatabaseFolder = databaseSettings.DatabaseFolder;
  Host = databaseSettings.Host;
  Port = databaseSettings.Port;
  User = databaseSettings.User;
@@ -54,9 +74,9 @@ public DatabaseSetting(DatabaseSetting databaseSettings)
  WipeOnStartup = databaseSettings.WipeOnStartup;
  }
 
- [DataMember(Order = 0)] public DatabaseType Type { get; set; }
+ [DataMember(Order = 0)] public string Type { get; set; }
 
- [DataMember(Order = 1)] public string SqLiteFolder { get; set; }
+ [DataMember(Order = 1)] public string DatabaseFolder { get; set; }
 
  [DataMember(Order = 2)] public string Host { get; set; }
 
@@ -68,6 +88,6 @@ public DatabaseSetting(DatabaseSetting databaseSettings)
 
  [DataMember(Order = 6)] public string Database { get; set; }
 
- [DataMember(Order = 6)] public bool WipeOnStartup { get; set; }
+ [DataMember(Order = 7)] public bool WipeOnStartup { get; set; }
  }
 }

Arrowgene.Ddon.Database/DdonDatabaseBuilder.cs

@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
 using Arrowgene.Ddon.Database.Model;
 using Arrowgene.Ddon.Database.Sql;
 using Arrowgene.Logging;
@@ -9,46 +11,75 @@ namespace Arrowgene.Ddon.Database
  public static class DdonDatabaseBuilder
  {
  private static readonly ILogger Logger = LogProvider.Logger<Logger>(typeof(DdonDatabaseBuilder));
+ private const string DefaultSchemaFile = "Script/schema_sqlite.sql";
 
  public static IDatabase Build(DatabaseSetting settings)
  {
- IDatabase database = null;
- switch (settings.Type)
+ Enum.TryParse(settings.Type, true, out DatabaseType dbType);
+ IDatabase database = dbType switch
  {
- case DatabaseType.SQLite:
-  string sqLitePath = Path.Combine(settings.SqLiteFolder, $"db.v{DdonSqLiteDb.Version}.sqlite");
-  database = BuildSqLite(settings.SqLiteFolder, sqLitePath, settings.WipeOnStartup);
-  break;
- }
+ DatabaseType.SQLite => BuildSqLite(settings.DatabaseFolder, settings.WipeOnStartup),
+ DatabaseType.PostgreSQL => BuildPostgres(settings.DatabaseFolder, settings.Host, settings.User, settings.Password, settings.Database, settings.WipeOnStartup),
+ DatabaseType.MariaDb => BuildMariaDB(settings.DatabaseFolder, settings.Host, settings.User, settings.Password, settings.Database, settings.WipeOnStartup),
+ _ => throw new ArgumentOutOfRangeException($"Unknown database type '{settings.Type}' encountered!")
+ };
 
  if (database == null)
  {
  Logger.Error("Database could not be created, exiting...");
  Environment.Exit(1);
  }
+ else
+ {
+ Logger.Info($"Database of type '${dbType.ToString()}' has been created.");
+ Logger.Info($"Database path: {settings.DatabaseFolder}");
+ }
 
  return database;
  }
 
- public static DdonSqLiteDb BuildSqLite(string sqLiteFolder, string sqLitePath, bool deleteIfExists)
+ public static DdonSqLiteDb BuildSqLite(string databaseFolder, bool wipeOnStartup)
+ {
+ string sqLitePath = Path.Combine(databaseFolder, $"db.v{DdonSqLiteDb.Version}.sqlite");
+ DdonSqLiteDb db = new DdonSqLiteDb(sqLitePath, wipeOnStartup);
+ if (db.CreateDatabase())
+ {
+ string schemaFilePath = Path.Combine(databaseFolder, DefaultSchemaFile);
+ String schema = File.ReadAllText(schemaFilePath, Encoding.UTF8);
+
+ db.Execute(schema);
+ }
+
+ return db;
+ }
+
+ public static DdonPostgresDb BuildPostgres(string databaseFolder, string host, string user, string password, string database, bool wipeOnStartup)
  {
- if (deleteIfExists)
+ DdonPostgresDb db = new DdonPostgresDb(host, user, password, database, wipeOnStartup);
+ if (db.CreateDatabase())
  {
- try
- {
- File.Delete(sqLitePath);
- }
- catch (Exception)
- {
- // ignored
- }
+ string schemaFilePath = Path.Combine(databaseFolder, DefaultSchemaFile);
+ String schema = File.ReadAllText(schemaFilePath, Encoding.UTF8);
+ schema = Regex.Replace(schema, "(\\s)DATETIME(\\s)", " TIMESTAMP WITH TIME ZONE ");
+ schema = Regex.Replace(schema, "(\\s)INTEGER PRIMARY KEY AUTOINCREMENT(\\s)", " SERIAL PRIMARY KEY ");
+ schema = Regex.Replace(schema, "(\\s)BLOB(\\s)", " BYTEA ");
+
+ db.Execute(schema);
  }
 
- DdonSqLiteDb db = new DdonSqLiteDb(sqLitePath);
+ return db;
+ }
+
+ public static DdonMariaDb BuildMariaDB(string databaseFolder, string host, string user, string password, string database, bool wipeOnStartup)
+ {
+ DdonMariaDb db = new DdonMariaDb(host, user, password, database, wipeOnStartup);
  if (db.CreateDatabase())
  {
- ScriptRunner scriptRunner = new ScriptRunner(db);
- scriptRunner.Run(Path.Combine(sqLiteFolder, "Script/schema_sqlite.sql"));
+ string schemaFilePath = Path.Combine(databaseFolder, DefaultSchemaFile);
+ String schema = File.ReadAllText(schemaFilePath, Encoding.UTF8);
+ schema = Regex.Replace(schema, "(\\s)AUTOINCREMENT(\\s)", " AUTO_INCREMENT ");
+
+ db.Execute(schema);
  }
 
  return db;