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

a few more useless changes

Browse Source
This commit is contained in:
UbitUmarov
2024-04-07 22:26:51 +01:00
parent 91d9c33128
commit f1cb40aa59
6 changed files with 64 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
View File

@@ -107,10 +107,8 @@ namespace OpenSim.Data.PGSQL
public bool Store(AuthenticationData data)
{
if (data.Data.ContainsKey("UUID"))
data.Data.Remove("UUID");
if (data.Data.ContainsKey("uuid"))
data.Data.Remove("uuid");
data.Data.Remove("UUID");
data.Data.Remove("uuid");
/*
Dictionary<string, object> oAuth = new Dictionary<string, object>();

23
OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs
View File

@@ -183,12 +183,12 @@ namespace OpenSim.Data.PGSQL
using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand())
{
if ( m_FieldTypes.ContainsKey(field) )
cmd.Parameters.Add(m_database.CreateParameter(field, key, m_FieldTypes[field]));
if ( m_FieldTypes.TryGetValue(field, out string ftype) )
cmd.Parameters.Add(m_database.CreateParameter(field, key, ftype));
else
cmd.Parameters.Add(m_database.CreateParameter(field, key));
string query = String.Format("SELECT * FROM {0} WHERE \"{1}\" = :{1}", m_Realm, field, field);
string query = $"SELECT * FROM {m_Realm} WHERE \"{field}\" = :{field}";
cmd.Connection = conn;
cmd.CommandText = query;
@@ -243,8 +243,8 @@ namespace OpenSim.Data.PGSQL
for (int i = 0; i < fields.Length; i++)
{
if ( m_FieldTypes.ContainsKey(fields[i]) )
cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], m_FieldTypes[fields[i]]));
if ( m_FieldTypes.TryGetValue(fields[i], out string ftype) )
cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], ftype));
else
cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
@@ -398,8 +398,9 @@ namespace OpenSim.Data.PGSQL
{
constraints.Add(new KeyValuePair<string, string>(fi.Name, fi.GetValue(row).ToString() ));
}
if (m_FieldTypes.ContainsKey(fi.Name))
cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row), m_FieldTypes[fi.Name]));
if (m_FieldTypes.TryGetValue(fi.Name, out string ftype))
cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row), ftype));
else
cmd.Parameters.Add(m_database.CreateParameter(fi.Name, fi.GetValue(row)));
}
@@ -418,8 +419,8 @@ namespace OpenSim.Data.PGSQL
names.Add(kvp.Key);
values.Add(":" + kvp.Key);
if (m_FieldTypes.ContainsKey(kvp.Key))
cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value, m_FieldTypes[kvp.Key]));
if (m_FieldTypes.TryGetValue(kvp.Key, out string ftype))
cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value, ftype));
else
cmd.Parameters.Add(m_database.CreateParameter("" + kvp.Key, kvp.Value));
}
@@ -493,8 +494,8 @@ namespace OpenSim.Data.PGSQL
{
for (int i = 0; i < fields.Length; i++)
{
if (m_FieldTypes.ContainsKey(fields[i]))
cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], m_FieldTypes[fields[i]]));
if (m_FieldTypes.TryGetValue(fields[i], out string ftype))
cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i], ftype));
else
cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));

8
OpenSim/Data/PGSQL/PGSQLSimulationData.cs
View File

@@ -196,12 +196,12 @@ namespace OpenSim.Data.PGSQL
{
while (itemReader.Read())
{
if (!(itemReader["primID"] is DBNull))
if (itemReader["primID"] is not DBNull)
{
UUID primID = new UUID(itemReader["primID"].ToString());
if (prims.ContainsKey(primID))
if(UUID.TryParse(itemReader["primID"].ToString(), out UUID primID) &&
prims.TryGetValue(primID, out SceneObjectPart sop))
{
primsWithInventory.Add(prims[primID]);
primsWithInventory.Add(sop);
}
}
}