Merge pull request #688 from RyanYappert/fix/small-fixes-1-3

Fix: Small Fixes 1/3
sebastian-heinz · Jan 10, 2025 · 52cbf5d · 52cbf5d
2 parents e643bc4 + c26d793
commit 52cbf5d
Show file tree

Hide file tree

Showing 17 changed files with 157 additions and 249 deletions.
diff --git a/Arrowgene.Ddon.Database/IDatabase.cs b/Arrowgene.Ddon.Database/IDatabase.cs
@@ -27,6 +27,8 @@ void ExecuteReader(
             Action<DbCommand> commandAction,
             Action<DbDataReader> readAction
         );
+        void ExecuteQuerySafe(DbConnection? connectionIn, Action<DbConnection> work);
+        T ExecuteQuerySafe<T>(DbConnection? connectionIn, Func<DbConnection, T> work);
 
         // Generic functions for getting/setting
         void AddParameter(DbCommand command, string name, object? value, DbType type);
@@ -120,7 +122,7 @@ CDataPawnSearchParameter searchParams
         );
         bool DeletePawn(uint pawnId);
         bool UpdatePawnBaseInfo(Pawn pawn);
-        uint GetPawnOwnerCharacterId(uint pawnId);
+        uint GetPawnOwnerCharacterId(uint pawnId, DbConnection? connectionIn = null);
         bool ReplacePawnReaction(uint pawnId, CDataPawnReaction pawnReaction, DbConnection? connectionIn = null);
 
         // Pawn Training Status

diff --git a/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDb.cs b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDb.cs
@@ -159,6 +159,19 @@ public void ExecuteQuerySafe(DbConnection? connectionIn, Action<TCon> work)
             }
         }
 
+        // Wrestling with generics; the interface is not happy to expose a generic,
+        // but a bunch of DB functions break if you don't allow the generic.
+        // This is the compromise.
+        public void ExecuteQuerySafe(DbConnection? connectionIn, Action<DbConnection> work)
+        {
+            ExecuteQuerySafe(connectionIn, (Action<TCon>)work);
+        }
+
+        public T ExecuteQuerySafe<T>(DbConnection? connectionIn, Func<DbConnection, T> work)
+        {
+            return ExecuteQuerySafe(connectionIn, (Func<TCon, T>)work);
+        }
+
         public bool MigrateDatabase(DatabaseMigrator migrator, uint toVersion)
         {
             uint currentVersion = GetMeta().DatabaseVersion;

diff --git a/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbPawn.cs b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbPawn.cs
@@ -306,31 +306,28 @@ CDataPawnSearchParameter searchParams
             return registeredPawns;
         }
 
-        public uint GetPawnOwnerCharacterId(uint pawnId)
-        {
-            using TCon connection = OpenNewConnection();
-            return GetPawnOwnerCharacterId(connection, pawnId);
-        }
-
-        public uint GetPawnOwnerCharacterId(TCon connection, uint pawnId)
+        public uint GetPawnOwnerCharacterId(uint pawnId, DbConnection? connectionIn = null)
         {
             uint ownerCharacterId = 0;
-            ExecuteReader(
-                connection,
-                SqlSelectPawnOwnerId,
-                command =>
-                {
-                    AddParameter(command, "@pawn_id", pawnId);
-                },
-                reader =>
-                {
-                    if (reader.Read())
+            ExecuteQuerySafe(connectionIn, connection =>
+            {
+                ExecuteReader(
+                    connection,
+                    SqlSelectPawnOwnerId,
+                    command =>
+                    {
+                        AddParameter(command, "@pawn_id", pawnId);
+                    },
+                    reader =>
                     {
-                        ownerCharacterId = GetUInt32(reader, "character_id");
+                        if (reader.Read())
+                        {
+                            ownerCharacterId = GetUInt32(reader, "character_id");
+                        }
                     }
-                }
-            );
-
+                );
+            });
+            
             return ownerCharacterId;
         }
 

diff --git a/Arrowgene.Ddon.GameServer/Characters/CharacterManager.cs b/Arrowgene.Ddon.GameServer/Characters/CharacterManager.cs
@@ -33,45 +33,51 @@ public CharacterManager(DdonGameServer server)
 
         public Character SelectCharacter(GameClient client, uint characterId, DbConnection? connectionIn = null)
         {
-            Character character = SelectCharacter(characterId, connectionIn);
+            Character character = SelectCharacter(characterId, connectionIn:connectionIn);
             client.Character = character;
             client.UpdateIdentity();
 
             return character;
         }
 
-        public Character SelectCharacter(uint characterId, DbConnection? connectionIn = null)
+        public Character SelectCharacter(uint characterId, bool fetchPawns = true, DbConnection? connectionIn = null)
         {
-            Character character = _Server.Database.SelectCharacter(characterId, connectionIn);
-            if (character == null)
+            return _Server.Database.ExecuteQuerySafe(connectionIn, connectionIn =>
             {
-                return null;
-            }
+                Character character = _Server.Database.SelectCharacter(characterId, connectionIn);
+                if (character == null)
+                {
+                    return null;
+                }
 
-            character.Server = _Server.AssetRepository.ServerList.Where(server => server.Id == _Server.Id).Single().ToCDataGameServerListInfo();
-            character.Equipment = character.Storage.GetCharacterEquipment();
+                character.Server = _Server.AssetRepository.ServerList.Where(server => server.Id == _Server.Id).Single().ToCDataGameServerListInfo();
+                character.Equipment = character.Storage.GetCharacterEquipment();
 
-            character.ExtendedParams = _Server.Database.SelectOrbGainExtendParam(character.CommonId, connectionIn);
-            if (character.ExtendedParams == null)
-            {
-                // Old DB is in use and new table not populated with required data for character
-                Logger.Error($"Character: AccountId={character.AccountId}, CharacterId={character.CharacterId}, CommonId={character.CommonId} is missing table entry in 'ddon_orb_gain_extend_param'.");
-                return null;
-            }
+                character.ExtendedParams = _Server.Database.SelectOrbGainExtendParam(character.CommonId, connectionIn);
+                if (character.ExtendedParams == null)
+                {
+                    // Old DB is in use and new table not populated with required data for character
+                    Logger.Error($"Character: AccountId={character.AccountId}, CharacterId={character.CharacterId}, CommonId={character.CommonId} is missing table entry in 'ddon_orb_gain_extend_param'.");
+                    return null;
+                }
 
-            character.EpitaphRoadState.UnlockedContent = _Server.Database.GetEpitaphRoadUnlocks(character.CharacterId, connectionIn);
+                character.EpitaphRoadState.UnlockedContent = _Server.Database.GetEpitaphRoadUnlocks(character.CharacterId, connectionIn);
 
-            if (_Server.GameLogicSettings.EnableEpitaphWeeklyRewards)
-            {
-                character.EpitaphRoadState.WeeklyRewardsClaimed = _Server.Database.GetEpitaphClaimedWeeklyRewards(character.CharacterId, connectionIn);
-            }
-
+                if (_Server.GameLogicSettings.EnableEpitaphWeeklyRewards)
+                {
+                    character.EpitaphRoadState.WeeklyRewardsClaimed = _Server.Database.GetEpitaphClaimedWeeklyRewards(character.CharacterId, connectionIn);
+                }
 
-            UpdateCharacterExtendedParams(character);
 
-            SelectPawns(character, connectionIn);
+                UpdateCharacterExtendedParams(character);
 
-            return character;
+                if (fetchPawns)
+                {
+                    SelectPawns(character, connectionIn);
+                }
+
+                return character;
+            });
         }
 
         private void SelectPawns(Character character, DbConnection? connectionIn = null)