a few fixes and cosmetics on some DB code

Update CombatModule.cs - typo

OpenSim/Data/MySQL/MySQLAssetData.cs

@@ -250,15 +250,16 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="uuidss">The assets' IDs</param>
         /// <returns>For each asset: true if it exists, false otherwise</returns>
+
+        // caller needs to handle exceptions
         public override bool[] AssetsExist(UUID[] uuids)
         {
             if (uuids.Length == 0)
                 return [];
 
-            HashSet<UUID> exist = new HashSet<UUID>();
+            HashSet<UUID> exist = [];
-
             string ids = "'" + string.Join("','", uuids) + "'";
-            string sql = string.Format("SELECT id FROM assets WHERE id IN ({0})", ids);
+            string sql = $"SELECT id FROM assets WHERE id IN ({ids})";
 
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
@@ -274,9 +275,7 @@ namespace OpenSim.Data.MySQL
                         }
                     }
                 }
-                dbcon.Close();
             }
-
             bool[] results = new bool[uuids.Length];
             for (int i = 0; i < uuids.Length; i++)
                 results[i] = exist.Contains(uuids[i]);
@@ -294,22 +293,20 @@ namespace OpenSim.Data.MySQL
         /// <returns>A list of AssetMetadata objects.</returns>
         public override List<AssetMetadata> FetchAssetMetadataSet(int start, int count)
         {
-            List<AssetMetadata> retList = new List<AssetMetadata>(count);
+            List<AssetMetadata> retList = new(count);
-
+            try
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
-                dbcon.Open();
+                using (MySqlConnection dbcon = new(m_connectionString))
-
-                using (MySqlCommand cmd
-                    = new MySqlCommand(
-                        "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
-                        dbcon))
                 {
-                    cmd.Parameters.AddWithValue("?start", start);
+                    dbcon.Open();
-                    cmd.Parameters.AddWithValue("?count", count);
 
-                    try
+                    using (MySqlCommand cmd = new(
+                            "SELECT name,description,assetType,temporary,id,asset_flags,CreatorID FROM assets LIMIT ?start, ?count",
+                            dbcon))
                     {
+                        cmd.Parameters.AddWithValue("?start", start);
+                        cmd.Parameters.AddWithValue("?count", count);
+
                         using (MySqlDataReader dbReader = cmd.ExecuteReader())
                         {
                             while (dbReader.Read())
@@ -330,36 +327,39 @@ namespace OpenSim.Data.MySQL
                             }
                         }
                     }
-                    catch (Exception e)
+                    return retList;
-                    {
-                        m_log.Error(
-                            string.Format(
-                                "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ",
-                                start, count),
-                            e);
-                    }
                 }
-                dbcon.Close();
+            }
+            catch (Exception e)
+            {
+                m_log.Error($"[ASSETS DB]: MySql failure fetching asset set from {start}, count {1}. Exception ", e);
             }
 
-            return retList;
+            return [];
         }
 
         public override bool Delete(string id)
         {
-            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            try
             {
-                dbcon.Open();
+                using (MySqlConnection dbcon = new(m_connectionString))
-
-                using (MySqlCommand cmd = new MySqlCommand("delete from assets where id=?id", dbcon))
                 {
-                    cmd.Parameters.AddWithValue("?id", id);
+                    dbcon.Open();
-                    cmd.ExecuteNonQuery();
+
+                    using (MySqlCommand cmd = new("delete from assets where id=?id", dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?id", id);
+                        cmd.ExecuteNonQuery();
+                    }
                 }
-                dbcon.Close();
+                return true;
+            }
+            catch (Exception e)
+            {
+                m_log.Error($"[ASSETS DB]: MySql failure on delete asset {id}", e);
             }
 
-            return true;
+            return false;
         }
 
         #endregion

OpenSim/Data/MySQL/MySQLUserProfilesData.cs

@@ -1007,7 +1007,7 @@ namespace OpenSim.Data.MySQL
                         cmd.Parameters.AddWithValue("?UserId", props.UserId.ToString());
                         cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString());
                         cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
-                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString());
+                        cmd.Parameters.AddWithValue("?DataVal", props.DataVal.ToString());
 
                         cmd.ExecuteNonQuery();
                     }

OpenSim/Data/MySQL/MySQLXAssetData.cs

@@ -406,7 +406,7 @@ namespace OpenSim.Data.MySQL
             HashSet<UUID> exists = new HashSet<UUID>();
 
             string ids = "'" + string.Join("','", uuids) + "'";
-            string sql = string.Format("SELECT ID FROM assets WHERE ID IN ({0})", ids);
+            string sql = $"SELECT ID FROM XAssetsMeta WHERE ID IN ({ids})";
 
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {

OpenSim/Data/PGSQL/PGSQLManager.cs

@@ -224,7 +224,7 @@ namespace OpenSim.Data.PGSQL
             }
             if (PGFieldType == "boolean" || PGFieldType == "bit")
             {
-                return (value.ToString() == "true");
+                return "true".Equals(value.ToString(), StringComparison.OrdinalIgnoreCase);
             }
             if (PGFieldType == "timestamp with time zone")
             {
@@ -307,7 +307,7 @@ namespace OpenSim.Data.PGSQL
         internal NpgsqlParameter CreateParameter(string parameterName, object parameterObject, string PGFieldType)
         {
             //Tweak so we dont always have to add : sign
-            if (parameterName.StartsWith(":")) parameterName = parameterName.Replace(":", "");
+            if (parameterName.StartsWith(':')) parameterName = parameterName[1..];
 
             //HACK if object is null, it is turned into a string, there are no nullable type till now
             if (parameterObject == null) parameterObject = "";

OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs

@@ -1042,7 +1042,7 @@ namespace OpenSim.Data.PGSQL
                         cmd.Parameters.Add(m_database.CreateParameter("UserId", props.UserId.ToString()));
                         cmd.Parameters.Add(m_database.CreateParameter("TagId", props.TagId.ToString()));
                         cmd.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
-                        cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataKey.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
 
                         cmd.ExecuteNonQuery();
                     }

OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs

@@ -2242,7 +2242,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     foreach (UserData ud in names)
                     {
                         // dont tell about unknown users, we can't send them back on Bad either
-                        if (string.IsNullOrEmpty(ud.FirstName) || ud.FirstName.Equals("Unkown"))
+                        if (string.IsNullOrEmpty(ud.FirstName) || ud.FirstName.Equals("Unknown"))
                             continue;
 
                         string fullname = ud.FirstName + " " + ud.LastName;
@@ -2643,4 +2643,4 @@ namespace OpenSim.Region.ClientStack.Linden
             }
         }
     }
-}
+}

OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

@@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
 
             if(!m_scenes.Contains(scene))
             {
-                m_log.WarnFormat("[CHAT]: message from unkown scene {0} ignored",
+                m_log.WarnFormat("[CHAT]: message from unknown scene {0} ignored",
                                      scene.RegionInfo.RegionName);
                 return;
             }

OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs

@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
                         if (killingAvatar == null)
                         {
                             IUserManagement userManager = deadAvatar.Scene.RequestModuleInterface<IUserManagement>();
-                            string userName = "Unkown User";
+                            string userName = "Unknown User";
                             if (userManager != null)
                                 userName = userManager.GetUserName(part.OwnerID);
                             deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, userName);

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -530,7 +530,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         break;
 
                     default:
-                        // unkown map item type
+                        // Unknown map item type
                         m_log.DebugFormat("[WORLD MAP]: Unknown MapItem type {0}", itemtype);
                         break;
                 }

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -318,7 +318,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected Vector3 m_acceleration;
         protected Vector3 m_angularVelocity;
 
-        //unkown if this will be kept, added as a way of removing the group position from the group class
+        //Unknown if this will be kept, added as a way of removing the group position from the group class
         protected Vector3 m_groupPosition;
         protected Material m_material = OpenMetaverse.Material.Wood;
         protected Vector3 m_offsetPosition;

OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs

@@ -83,7 +83,7 @@ namespace OpenSim.Server.Handlers.Presence
                             if (request.TryGetValue("UserID", out object uo) && uo is string user)
                                 m_log.Debug($"[PRESENCE HANDLER]: ilegal login try from {httpRequest.RemoteIPEndPoint} for userID {user}");
                             else
-                                m_log.Debug($"[PRESENCE HANDLER]: ilegal login try from {httpRequest.RemoteIPEndPoint} for unkown user");
+                                m_log.Debug($"[PRESENCE HANDLER]: ilegal login try from {httpRequest.RemoteIPEndPoint} for unknown user");
 
                             return FailureResult();
                         }

OpenSim/Services/AssetService/AssetService.cs

@@ -156,8 +156,8 @@ namespace OpenSim.Services.AssetService
         {
             try
             {
-                UUID[] uuid = Array.ConvertAll(ids, id => UUID.Parse(id));
+                UUID[] uuids = Array.ConvertAll(ids, id => UUID.Parse(id));
-                return m_Database.AssetsExist(uuid);
+                return m_Database.AssetsExist(uuids);
             }
             catch (Exception e)
             {
@@ -192,13 +192,12 @@ namespace OpenSim.Services.AssetService
 
         public virtual bool Delete(string id)
         {
-//            m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id);
+            //m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id);
 
-            UUID assetID;
+            if (UUID.TryParse(id, out _))
-            if (!UUID.TryParse(id, out assetID))
+                return m_Database.Delete(id);
-                return false;
 
-            return m_Database.Delete(id);
+            return false;
         }
 
         public void Get(string id, string ForeignAssetService, bool StoreOnLocalGrid, SimpleAssetRetrieved callBack)

OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs

@@ -346,7 +346,7 @@ namespace OpenSim.Services.Connectors
             sendData["LastName"] = last;
             sendData["Password"] = password;
             if (!string.IsNullOrEmpty(email))
-                sendData["Email"] = first;
+                sendData["Email"] = email;
             sendData["ScopeID"] = scopeID.ToString();
 
             return SendAndGetReply(sendData);