From 56fe4c24b8c67ec3b6a5a897c35ab19507bd1077 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Apr 2010 17:45:00 +0100
Subject: 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.

---
 OpenSim/Data/SQLite/SQLiteFramework.cs | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

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

diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 12b2750..79eaab3 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
 
 namespace OpenSim.Data.SQLite
 {
@@ -57,7 +57,19 @@ namespace OpenSim.Data.SQLite
         {
             lock (m_Connection)
             {
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
                 cmd.Connection = m_Connection;
+=======
+/*
+                SqliteConnection newConnection =
+                        (SqliteConnection)((ICloneable)connection).Clone();
+                newConnection.Open();
+
+                cmd.Connection = newConnection;
+*/
+                cmd.Connection = connection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
 
                 return cmd.ExecuteNonQuery();
             }
@@ -65,12 +77,27 @@ namespace OpenSim.Data.SQLite
         
         protected IDataReader ExecuteReader(SqliteCommand cmd)
         {
+<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
             SqliteConnection newConnection =
                     (SqliteConnection)((ICloneable)m_Connection).Clone();
             newConnection.Open();
 
             cmd.Connection = newConnection;
             return cmd.ExecuteReader();
+=======
+            lock (connection)
+            {
+                //SqliteConnection newConnection =
+                //        (SqliteConnection)((ICloneable)connection).Clone();
+                //newConnection.Open();
+
+                //cmd.Connection = newConnection;
+                cmd.Connection = connection;
+                //Console.WriteLine("XXX " + cmd.CommandText);
+
+                return cmd.ExecuteReader();
+            }
+>>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
         }
 
         protected void CloseReaderCommand(SqliteCommand cmd)
-- 
cgit v1.1


From 0b8b302aa0f2ee25be5cbdfefe232459e6e5b778 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Apr 2010 20:05:57 +0100
Subject: Fix a bunch of issues that crop up after the naive porting of the new
 sqlite db from master to 0.6.9

---
 OpenSim/Data/SQLite/SQLiteFramework.cs | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

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

diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index 79eaab3..9567727 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -57,19 +57,7 @@ namespace OpenSim.Data.SQLite
         {
             lock (m_Connection)
             {
-<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
                 cmd.Connection = m_Connection;
-=======
-/*
-                SqliteConnection newConnection =
-                        (SqliteConnection)((ICloneable)connection).Clone();
-                newConnection.Open();
-
-                cmd.Connection = newConnection;
-*/
-                cmd.Connection = connection;
-                //Console.WriteLine("XXX " + cmd.CommandText);
->>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
 
                 return cmd.ExecuteNonQuery();
             }
@@ -77,27 +65,18 @@ namespace OpenSim.Data.SQLite
         
         protected IDataReader ExecuteReader(SqliteCommand cmd)
         {
-<<<<<<< HEAD:OpenSim/Data/SQLite/SQLiteFramework.cs
-            SqliteConnection newConnection =
-                    (SqliteConnection)((ICloneable)m_Connection).Clone();
-            newConnection.Open();
-
-            cmd.Connection = newConnection;
-            return cmd.ExecuteReader();
-=======
-            lock (connection)
+            lock (m_Connection)
             {
                 //SqliteConnection newConnection =
                 //        (SqliteConnection)((ICloneable)connection).Clone();
                 //newConnection.Open();
 
                 //cmd.Connection = newConnection;
-                cmd.Connection = connection;
+                cmd.Connection = m_Connection;
                 //Console.WriteLine("XXX " + cmd.CommandText);
 
                 return cmd.ExecuteReader();
             }
->>>>>>> cc67de5... rename SQLiteNG to SQLite and SQLite to SQLiteLegacy:OpenSim/Data/SQLite/SQLiteFramework.cs
         }
 
         protected void CloseReaderCommand(SqliteCommand cmd)
@@ -107,4 +86,4 @@ namespace OpenSim.Data.SQLite
             cmd.Dispose();
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1