OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mantis #2102 

Thank you, RuudL, for a patch that supplements the previous MSSQL
patch.
0.6.0-stable
Melanie Thielker 2008-09-02 13:43:49 +00:00
parent 2e4a5aa98a
commit 930b2ec602
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Data/MSSQL/MSSQLEstateData.cs
View File

@ -137,7 +137,9 @@ namespace OpenSim.Data.MSSQL
} }
else else
{ {
_FieldMap[name].SetValue(es, reader[name]); es.EstateID = Convert.ToUInt32(reader["EstateID"].ToString());
//Problems converting a Int32 to a UInt32
//_FieldMap[name].SetValue(es, reader["EstateID"]);
} }
} }
} }
@ -188,7 +190,6 @@ namespace OpenSim.Data.MSSQL
} }
} }
SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int); SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
idParameter.Direction = ParameterDirection.Output; idParameter.Direction = ParameterDirection.Output;
insertCommand.Parameters.Add(idParameter); insertCommand.Parameters.Add(idParameter);
@ -199,16 +200,16 @@ namespace OpenSim.Data.MSSQL
} }
} }
using (AutoClosingSqlCommand cmd = _Database.Query("insert into estate_map values (@RegionID, @EstateID)")) using (AutoClosingSqlCommand cmd = _Database.Query("INSERT INTO [estate_map] ([RegionID] ,[EstateID]) VALUES (@RegionID, @EstateID)"))
{ {
cmd.Parameters.AddWithValue("@RegionID", regionID.ToString()); cmd.Parameters.Add(_Database.CreateParameter("@RegionID", regionID.ToString()));
cmd.Parameters.AddWithValue("@EstateID", es.EstateID); cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
// This will throw on dupe key // This will throw on dupe key
try try
{ {
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
catch (Exception) catch (Exception Ex)
{ {
_Log.Debug("[ESTATE DB]: Error inserting regionID and EstateID in estate_map"); _Log.Debug("[ESTATE DB]: Error inserting regionID and EstateID in estate_map");
} }
@ -220,7 +221,7 @@ namespace OpenSim.Data.MSSQL
sql = string.Format("insert into estateban select {0}, bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = @UUID", es.EstateID); sql = string.Format("insert into estateban select {0}, bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = @UUID", es.EstateID);
using (AutoClosingSqlCommand cmd = _Database.Query(sql)) using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{ {
cmd.Parameters.AddWithValue("@UUID", regionID); cmd.Parameters.Add(_Database.CreateParameter("@UUID", regionID));
try try
{ {

3
OpenSim/Data/MSSQL/MSSQLRegionData.cs
View File

@ -644,7 +644,7 @@ VALUES
RegionSettings regionSettings; RegionSettings regionSettings;
using (AutoClosingSqlCommand cmd = _Database.Query(sql)) using (AutoClosingSqlCommand cmd = _Database.Query(sql))
{ {
cmd.Parameters.AddWithValue("@regionUUID", regionUUID.ToString()); cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionUUID.ToString()));
using(SqlDataReader reader = cmd.ExecuteReader()) using(SqlDataReader reader = cmd.ExecuteReader())
{ {
if (reader.Read()) if (reader.Read())
@ -678,6 +678,7 @@ VALUES
string regionUUID = null; string regionUUID = null;
using (AutoClosingSqlCommand cmd = _Database.Query("SELECT regionUUID FROM regionsettings WHERE regionUUID = @regionUUID")) using (AutoClosingSqlCommand cmd = _Database.Query("SELECT regionUUID FROM regionsettings WHERE regionUUID = @regionUUID"))
{ {
cmd.Parameters.Add(_Database.CreateParameter("@regionUUID", regionSettings.RegionUUID));
regionUUID = cmd.ExecuteScalar().ToString(); regionUUID = cmd.ExecuteScalar().ToString();
} }