Compare commits

...

1 Commits

Author SHA1 Message Date
Vincent Sylvester
2494f23538 Postgres fixes for uuid type handling
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2026-06-12 11:35:40 +01:00
3 changed files with 12 additions and 9 deletions

View File

@@ -352,12 +352,12 @@ namespace OpenSim.Data.PGSQL
//Insert after
cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\", \"banningUUID\",\"banTime\" ) values ( :EstateID, :bannedUUID, '','','', :banningUUID, :banTime )";
cmd.Parameters.AddWithValue("bannedUUID", Guid.Empty);
foreach (EstateBan b in es.EstateBans)
{
cmd.Parameters.Clear();
cmd.Parameters["EstateID"].Value = b.EstateID;
cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid;
cmd.Parameters["banningUUID"].Value = b.BanningUserID.Guid;
cmd.Parameters["bannedUUID"].Value = _Database.CreateParameter("bannedUUID", b.BannedUserID).Value;
cmd.Parameters["banningUUID"].Value = _Database.CreateParameter("banningUUID", b.BanningUserID).Value;
cmd.Parameters["banTime"].Value = b.BanTime;
cmd.ExecuteNonQuery();
@@ -378,10 +378,10 @@ namespace OpenSim.Data.PGSQL
cmd.ExecuteNonQuery();
cmd.CommandText = string.Format("insert into {0} (\"EstateID\", uuid) values ( :EstateID, :uuid )", table);
cmd.Parameters.AddWithValue("uuid", Guid.Empty);
foreach (UUID uuid in data)
{
cmd.Parameters["uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
cmd.Parameters.Clear();
cmd.Parameters.Add(_Database.CreateParameter("uuid", uuid));
cmd.ExecuteNonQuery();
}
}

View File

@@ -134,10 +134,13 @@ namespace OpenSim.Data.PGSQL
foreach (DataRow row in schemaTable.Rows)
{
if (row["ColumnName"] != null &&
(!m_Fields.ContainsKey(row["ColumnName"].ToString())))
m_ColumnNames.Add(row["ColumnName"].ToString());
if (row["ColumnName"] == null)
continue;
string col = row["ColumnName"].ToString();
if (!m_Fields.ContainsKey(col))
m_ColumnNames.Add(col);
}
}

View File

@@ -171,7 +171,7 @@ namespace OpenSim.Data.PGSQL
{
// cmd.CommandText = String.Format(@"select * from inventoryitems where ""avatarID"" = :uuid and ""assetType"" = :type and ""flags"" = 1", m_Realm);
cmd.CommandText = "select * from inventoryitems where avatarID = :uuid and assetType = :type and flags = 1";
cmd.CommandText = "select * from inventoryitems where \"avatarID\" = :uuid and \"assetType\" = :type and \"flags\" = 1";
cmd.Parameters.Add(m_database.CreateParameter("uuid", principalID));
cmd.Parameters.Add(m_database.CreateParameter("type", (int)AssetType.Gesture));