Change to dictionary

ACEmulator · Dec 18, 2024 · b5827e9 · b5827e9
1 parent 851f1ef
commit b5827e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 33 deletions.
diff --git a/Source/ACE.Database/DatabaseManager.cs b/Source/ACE.Database/DatabaseManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 using Microsoft.EntityFrameworkCore;
 
@@ -72,40 +73,15 @@ public static void Stop()
                 serializedShardDb.Stop();
         }
 
-        private static ServerVersion authServerVersion;
-        private static ServerVersion shardServerVersion;
-        private static ServerVersion worldServerVersion;
-        public static ServerVersion CachedServerVersionAutoDetect(int database, string connectionString)
-        {
-            var serverVersion = database switch
-            {
-                1 => authServerVersion,
-                2 => shardServerVersion,
-                _ => worldServerVersion,
-            };
+        private static readonly Dictionary<string, ServerVersion> cachedServerVersions = new();
 
-            if (serverVersion != null)
-                return serverVersion;
+        public static ServerVersion CachedServerVersionAutoDetect(string database, string connectionString)
+        {
+            if (cachedServerVersions.TryGetValue(database, out ServerVersion serverVersion)) { return serverVersion; }
 
             serverVersion = ServerVersion.AutoDetect(connectionString);
 
-            //using var connection = new MySqlConnection(
-            //    new MySqlConnectionStringBuilder(connectionString)
-            //    {
-            //        Database = string.Empty,
-            //        AutoEnlist = false,
-            //        //Pooling = false, 
-            //    }.ConnectionString);
-            //connection.Open();
-
-            //serverVersion = ServerVersion.Parse(connection.ServerVersion);
-
-            if (database == 1)
-                authServerVersion = serverVersion;
-            else if (database == 2)
-                shardServerVersion = serverVersion;
-            else
-                worldServerVersion = serverVersion;
+            cachedServerVersions[database] = serverVersion;
 
             return serverVersion;
         }

diff --git a/Source/ACE.Database/Models/Auth/AuthDbContext.cs b/Source/ACE.Database/Models/Auth/AuthDbContext.cs
@@ -28,7 +28,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             var connectionString = $"server={config.Host};port={config.Port};user={config.Username};password={config.Password};database={config.Database};{config.ConnectionOptions}";
 
-            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(1, connectionString), builder =>
+            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(config.Database, connectionString), builder =>
             {
                 builder.EnableRetryOnFailure(10);
             });

diff --git a/Source/ACE.Database/Models/Shard/ShardDbContext.cs b/Source/ACE.Database/Models/Shard/ShardDbContext.cs
@@ -104,7 +104,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             var connectionString = $"server={config.Host};port={config.Port};user={config.Username};password={config.Password};database={config.Database};{config.ConnectionOptions}";
 
-            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(2, connectionString), builder =>
+            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(config.Database, connectionString), builder =>
             {
                 builder.EnableRetryOnFailure(10);
             });

diff --git a/Source/ACE.Database/Models/World/WorldDbContext.cs b/Source/ACE.Database/Models/World/WorldDbContext.cs
@@ -132,7 +132,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             var connectionString = $"server={config.Host};port={config.Port};user={config.Username};password={config.Password};database={config.Database};{config.ConnectionOptions}";
 
-            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(3, connectionString), builder =>
+            optionsBuilder.UseMySql(connectionString, DatabaseManager.CachedServerVersionAutoDetect(config.Database, connectionString), builder =>
             {
                 builder.EnableRetryOnFailure(10);
             });