ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-16 02:25:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bunch of issues that crop up after the naive porting of the new sqlite db from master to 0.6.9

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2010-04-30 20:05:57 +01:00
parent d8b604b550
commit 0b8b302aa0
16 changed files with 24 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs
View File

@@ -54,11 +54,8 @@ 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));
//Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
m_Connection.Open();
if (storeName != String.Empty)
@@ -74,10 +71,6 @@ namespace OpenSim.Data.SQLite
//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();
}
Type t = typeof(T);
@@ -200,11 +193,7 @@ 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();
}