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

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

28
OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
View File

@@ -258,33 +258,17 @@ namespace OpenSim.Data.SQLite
return false;
}
public virtual bool Delete(string field, string key)
public bool Delete(string field, string val)
{
return Delete(new string[] { field }, new string[] { key });
}
public bool Delete(string[] fields, string[] keys)
{
if (fields.Length != keys.Length)
return false;
List<string> terms = new List<string>();
SqliteCommand cmd = new SqliteCommand();
for (int i = 0 ; i < fields.Length ; i++)
{
cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
terms.Add("`" + fields[i] + "` = :" + fields[i]);
}
cmd.CommandText = String.Format("delete from {0} where `{1}` = :{1}", m_Realm, field);
cmd.Parameters.Add(new SqliteParameter(field, val));
string where = String.Join(" and ", terms.ToArray());
if (ExecuteNonQuery(cmd, m_Connection) > 0)
return true;
string query = String.Format("delete * from {0} where {1}", m_Realm, where);
cmd.CommandText = query;
return ExecuteNonQuery(cmd, m_Connection) > 0;
return false;
}
}
}

10
OpenSim/Data/SQLite/SQLiteXInventoryData.cs
View File

@@ -91,21 +91,11 @@ namespace OpenSim.Data.SQLite
return m_Folders.Delete(field, val);
}
public bool DeleteFolders(string[] fields, string[] vals)
{
return m_Folders.Delete(fields, vals);
}
public bool DeleteItems(string field, string val)
{
return m_Items.Delete(field, val);
}
public bool DeleteItems(string[] fields, string[] vals)
{
return m_Items.Delete(fields, vals);
}
public bool MoveItem(string id, string newParent)
{
return m_Items.MoveItem(id, newParent);