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

Accidentally committed too early

Browse Source 
Revert "Allow item links to be deleted even when other deletes and purges are disabled."

This reverts commit 491279f99a.
This commit is contained in:
Justin Clark-Casey (justincc)
2011-05-18 00:23:35 +01:00
parent c562b9ef19
commit 6dcc87b1ad
8 changed files with 30 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
View File

@@ -335,35 +335,24 @@ namespace OpenSim.Data.MSSQL
}
}
public virtual bool Delete(string field, string key)
public virtual bool Delete(string field, string val)
{
return Delete(new string[] { field }, new string[] { key });
}
public virtual bool Delete(string[] fields, string[] keys)
{
if (fields.Length != keys.Length)
return false;
List<string> terms = new List<string>();
using (SqlConnection conn = new SqlConnection(m_ConnectionString))
using (SqlCommand cmd = new SqlCommand())
{
for (int i = 0; i < fields.Length; i++)
{
cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i]));
terms.Add("[" + fields[i] + "] = @" + fields[i]);
}
string where = String.Join(" AND ", terms.ToArray());
string query = String.Format("DELETE * FROM {0} WHERE {1}", m_Realm, where);
string deleteCommand = String.Format("DELETE FROM {0} WHERE [{1}] = @{1}", m_Realm, field);
cmd.CommandText = deleteCommand;
cmd.Parameters.Add(m_database.CreateParameter(field, val));
cmd.Connection = conn;
cmd.CommandText = query;
conn.Open();
return cmd.ExecuteNonQuery() > 0;
if (cmd.ExecuteNonQuery() > 0)
{
//m_log.Warn("[MSSQLGenericTable]: " + deleteCommand);
return true;
}
return false;
}
}
}