From 8a4947f8c75a2dbcd8c13dbff9ad2eff52711f0e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 21 Feb 2010 08:47:24 -0800
Subject: SQLite connector for UserAccounts and Auth works. Yey!

---
 OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs')

diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index e7e158d..b39bb19 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Data.SQLite
         protected string m_Realm;
         protected FieldInfo m_DataField = null;
 
+        protected static SqliteConnection m_Connection;
         private static bool m_initialized;
 
         public SQLiteGenericTableHandler(string connectionString,
@@ -63,9 +64,14 @@ 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(m_Connection, assem, storeName);
+                    Migration m = new Migration(newConnection, assem, storeName);
                     m.Update();
+                    newConnection.Close();
+                    newConnection.Dispose();
                 }
 
                 m_initialized = true;
@@ -136,7 +142,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];
 
@@ -191,7 +197,7 @@ namespace OpenSim.Data.SQLite
                 result.Add(row);
             }
 
-            CloseReaderCommand(cmd);
+            CloseCommand(cmd);
 
             return result.ToArray();
         }
@@ -240,7 +246,7 @@ namespace OpenSim.Data.SQLite
 
             cmd.CommandText = query;
 
-            if (ExecuteNonQuery(cmd) > 0)
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
                 return true;
 
             return false;
@@ -253,7 +259,7 @@ namespace OpenSim.Data.SQLite
             cmd.CommandText = String.Format("delete from {0} where `{1}` = :{1}", m_Realm, field);
             cmd.Parameters.Add(new SqliteParameter(field, val));
 
-            if (ExecuteNonQuery(cmd) > 0)
+            if (ExecuteNonQuery(cmd, m_Connection) > 0)
                 return true;
 
             return false;
-- 
cgit v1.1