1 files changed, 43 insertions, 13 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 86eaca1..4f977a8 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -30,7 +30,11 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using log4net;
-using Mono.Data.Sqlite;
+#if CSharpSqlite
+    using Community.CsharpSqlite.Sqlite;
+#else
+    using Mono.Data.Sqlite;
+#endif
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -48,11 +52,20 @@ namespace OpenSim.Data.SQLite
         protected string m_Realm;
         protected FieldInfo m_DataField = null;
 
+        protected static SqliteConnection m_Connection;
+        private static bool m_initialized;
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
         public SQLiteGenericTableHandler(string connectionString,
                 string realm, string storeName) : base(connectionString)
         {
             m_Realm = realm;
-            if (storeName != String.Empty)
+
+            if (!m_initialized)
             {
                 m_Connection = new SqliteConnection(connectionString);
                 //Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
@@ -60,17 +73,18 @@ namespace OpenSim.Data.SQLite
 
                 if (storeName != String.Empty)
                 {
-                    Assembly assem = GetType().Assembly;
                     //SqliteConnection newConnection =
                     //        (SqliteConnection)((ICloneable)m_Connection).Clone();
                     //newConnection.Open();
 
-                    //Migration m = new Migration(newConnection, assem, storeName);
-                    Migration m = new Migration(m_Connection, assem, storeName);
+                    //Migration m = new Migration(newConnection, Assembly, storeName);
+                    Migration m = new Migration(m_Connection, Assembly, storeName);
                     m.Update();
                     //newConnection.Close();
                     //newConnection.Dispose();
                 }
+
+                m_initialized = true;
             }
 
             Type t = typeof(T);
@@ -138,7 +152,7 @@ namespace OpenSim.Data.SQLite
 
         protected T[] DoQuery(SqliteCommand cmd)
         {
-            IDataReader reader = ExecuteReader(cmd);
+            IDataReader reader = ExecuteReader(cmd, m_Connection);
             if (reader == null)
                 return new T[0];
 
@@ -242,23 +256,39 @@ namespace OpenSim.Data.SQLite
 
             cmd.CommandText = query;
 
-            if (ExecuteNonQuery(cmd) > 0)
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
                 return true;
 
             return false;
         }
 
-        public bool Delete(string field, string val)
+        public virtual bool Delete(string field, string key)
         {
+            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();
 
-            cmd.CommandText = String.Format("delete from {0} where `{1}` = :{1}", m_Realm, field);
-            cmd.Parameters.Add(new SqliteParameter(field, val));
+            for (int i = 0 ; i < fields.Length ; i++)
+            {
+                cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
+                terms.Add("`" + fields[i] + "` = :" + fields[i]);
+            }
 
-            if (ExecuteNonQuery(cmd) > 0)
-                return true;
+            string where = String.Join(" and ", terms.ToArray());
 
-            return false;
+            string query = String.Format("delete from {0} where {1}", m_Realm, where);
+
+            cmd.CommandText = query;
+
+            return ExecuteNonQuery(cmd, m_Connection) > 0;
         }
     }
 }