diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs | 35 | ||||
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | 10 |
2 files changed, 12 insertions, 33 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs index 317afac..f5492b3 100644 --- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs +++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs | |||
@@ -335,35 +335,24 @@ namespace OpenSim.Data.MSSQL | |||
335 | } | 335 | } |
336 | } | 336 | } |
337 | 337 | ||
338 | public virtual bool Delete(string field, string key) | 338 | public virtual bool Delete(string field, string val) |
339 | { | 339 | { |
340 | return Delete(new string[] { field }, new string[] { key }); | ||
341 | } | ||
342 | |||
343 | public virtual bool Delete(string[] fields, string[] keys) | ||
344 | { | ||
345 | if (fields.Length != keys.Length) | ||
346 | return false; | ||
347 | |||
348 | List<string> terms = new List<string>(); | ||
349 | |||
350 | using (SqlConnection conn = new SqlConnection(m_ConnectionString)) | 340 | using (SqlConnection conn = new SqlConnection(m_ConnectionString)) |
351 | using (SqlCommand cmd = new SqlCommand()) | 341 | using (SqlCommand cmd = new SqlCommand()) |
352 | { | 342 | { |
353 | for (int i = 0; i < fields.Length; i++) | 343 | string deleteCommand = String.Format("DELETE FROM {0} WHERE [{1}] = @{1}", m_Realm, field); |
354 | { | 344 | cmd.CommandText = deleteCommand; |
355 | cmd.Parameters.Add(m_database.CreateParameter(fields[i], keys[i])); | 345 | |
356 | terms.Add("[" + fields[i] + "] = @" + fields[i]); | 346 | cmd.Parameters.Add(m_database.CreateParameter(field, val)); |
357 | } | ||
358 | |||
359 | string where = String.Join(" AND ", terms.ToArray()); | ||
360 | |||
361 | string query = String.Format("DELETE * FROM {0} WHERE {1}", m_Realm, where); | ||
362 | |||
363 | cmd.Connection = conn; | 347 | cmd.Connection = conn; |
364 | cmd.CommandText = query; | ||
365 | conn.Open(); | 348 | conn.Open(); |
366 | return cmd.ExecuteNonQuery() > 0; | 349 | |
350 | if (cmd.ExecuteNonQuery() > 0) | ||
351 | { | ||
352 | //m_log.Warn("[MSSQLGenericTable]: " + deleteCommand); | ||
353 | return true; | ||
354 | } | ||
355 | return false; | ||
367 | } | 356 | } |
368 | } | 357 | } |
369 | } | 358 | } |
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs index 01689a4..5bc4fe4 100644 --- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | |||
@@ -79,21 +79,11 @@ namespace OpenSim.Data.MSSQL | |||
79 | return m_Folders.Delete(field, val); | 79 | return m_Folders.Delete(field, val); |
80 | } | 80 | } |
81 | 81 | ||
82 | public bool DeleteFolders(string[] fields, string[] vals) | ||
83 | { | ||
84 | return m_Folders.Delete(fields, vals); | ||
85 | } | ||
86 | |||
87 | public bool DeleteItems(string field, string val) | 82 | public bool DeleteItems(string field, string val) |
88 | { | 83 | { |
89 | return m_Items.Delete(field, val); | 84 | return m_Items.Delete(field, val); |
90 | } | 85 | } |
91 | 86 | ||
92 | public bool DeleteItems(string[] fields, string[] vals) | ||
93 | { | ||
94 | return m_Items.Delete(fields, vals); | ||
95 | } | ||
96 | |||
97 | public bool MoveItem(string id, string newParent) | 87 | public bool MoveItem(string id, string newParent) |
98 | { | 88 | { |
99 | return m_Items.MoveItem(id, newParent); | 89 | return m_Items.MoveItem(id, newParent); |