ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-21 04:55:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

a few cosmetic changes

Browse Source
This commit is contained in:
UbitUmarov
2023-11-12 22:24:53 +00:00
parent 80e930e9a6
commit f94f6e77bf
10 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
View File

@@ -37,10 +37,9 @@ namespace OpenSim.Data.MySQL
{
public class MySQLGenericTableHandler<T> : MySqlFramework where T: class, new()
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
//private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Dictionary<string, FieldInfo> m_Fields =
new Dictionary<string, FieldInfo>();
protected Dictionary<string, FieldInfo> m_Fields = new Dictionary<string, FieldInfo>();
protected List<string> m_ColumnNames = null;
protected string m_Realm;
@@ -69,7 +68,7 @@ namespace OpenSim.Data.MySQL
protected void CommonConstruct(string storeName)
{
if (storeName != String.Empty)
if (!string.IsNullOrEmpty(storeName))
{
// We always use a new connection for any Migrations
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
@@ -120,7 +119,7 @@ namespace OpenSim.Data.MySQL
using (MySqlCommand cmd = new MySqlCommand())
{
cmd.Parameters.AddWithValue(field, key);
cmd.CommandText = string.Format("select * from {0} where `{1}` = ?{1}", m_Realm, field);
cmd.CommandText = $"select * from {m_Realm} where `{field}` = ?{field}";
return DoQuery(cmd);
}
}
@@ -284,10 +283,7 @@ namespace OpenSim.Data.MySQL
{
using (MySqlCommand cmd = new MySqlCommand())
{
string query = String.Format("select * from {0} where {1}",
m_Realm, where);
cmd.CommandText = query;
cmd.CommandText = $"select * from {m_Realm} where {where}"; ;
return DoQuery(cmd);
}
@@ -295,7 +291,7 @@ namespace OpenSim.Data.MySQL
public virtual bool Store(T row)
{
// m_log.DebugFormat("[MYSQL GENERIC TABLE HANDLER]: Store(T row) invoked");
//m_log.DebugFormat("[MYSQL GENERIC TABLE HANDLER]: Store(T row) invoked");
using (MySqlCommand cmd = new MySqlCommand())
{
@@ -313,9 +309,7 @@ namespace OpenSim.Data.MySQL
// InventoryTransferModule or we may be required to substitute a DBNull here.
if (fi.GetValue(row) == null)
throw new NullReferenceException(
string.Format(
"[MYSQL GENERIC TABLE HANDLER]: Trying to store field {0} for {1} which is unexpectedly null",
fi.Name, row));
$"[MYSQL GENERIC TABLE HANDLER]: Trying to store field {fi.Name} for {row} which is unexpectedly null");
cmd.Parameters.AddWithValue(fi.Name, fi.GetValue(row).ToString());
}
@@ -333,7 +327,7 @@ namespace OpenSim.Data.MySQL
}
}
query = String.Format("replace into {0} (`", m_Realm) + String.Join("`,`", names.ToArray()) + "`) values (" + String.Join(",", values.ToArray()) + ")";
query = $"replace into {m_Realm} (`" + String.Join("`,`", names.ToArray()) + "`) values (" + String.Join(",", values.ToArray()) + ")";
cmd.CommandText = query;
@@ -351,9 +345,9 @@ namespace OpenSim.Data.MySQL
public virtual bool Delete(string[] fields, string[] keys)
{
// m_log.DebugFormat(
// "[MYSQL GENERIC TABLE HANDLER]: Delete(string[] fields, string[] keys) invoked with {0}:{1}",
// string.Join(",", fields), string.Join(",", keys));
//m_log.DebugFormat(
// "[MYSQL GENERIC TABLE HANDLER]: Delete(string[] fields, string[] keys) invoked with {0}:{1}",
// string.Join(",", fields), string.Join(",", keys));
int flen = fields.Length;
if (flen == 0 || flen != keys.Length)