Accidentally committed too early

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

This reverts commit 491279f99afc65860d44765ee7829c7dd5e4e38e.

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
             }
         }
 
-        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;
             }
         }
     }
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
             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);