rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was

SQLiteNG MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if
using standalone) See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details This commit also temporarily changes unsigned ParentEstateID values in the
OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies).  And change data
columns in sqlite is a pita.

1 files changed, 25 insertions, 1 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
index 8e91693..918cb3d 100644
--- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
+++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Reflection;
 using log4net;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -54,7 +54,27 @@ namespace OpenSim.Data.SQLite
             m_Realm = realm;
             if (storeName != String.Empty)
             {
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
                 Assembly assem = GetType().Assembly;
+=======
+                m_Connection = new SqliteConnection(connectionString);
+                Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
+                m_Connection.Open();
+
+                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);
+                    m.Update();
+                    //newConnection.Close();
+                    //newConnection.Dispose();
+                }
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
 
                 Migration m = new Migration(m_Connection, assem, storeName);
                 m.Update();
@@ -180,7 +200,11 @@ namespace OpenSim.Data.SQLite
                 result.Add(row);
             }
 
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
             CloseReaderCommand(cmd);
+=======
+            //CloseCommand(cmd);
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
 
             return result.ToArray();
         }