OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
slimupdates
Justin Clark-Casey (justincc) 2010-04-30 17:45:00 +01:00
parent 60dbc3c6ce
commit cc67de5b86
74 changed files with 459 additions and 458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

@ -30,7 +30,7 @@ using System.Data;
using System.Reflection;
using System.Collections.Generic;
using log4net;
using Mono.Data.SqliteClient;
using Mono.Data.Sqlite;
using OpenMetaverse;
using OpenSim.Framework;

21
OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
View File

@ -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
{
@ -56,13 +56,8 @@ namespace OpenSim.Data.SQLite
m_Connection = new SqliteConnection(connectionString);
m_Connection.Open();
using (SqliteConnection dbcon = (SqliteConnection)((ICloneable)m_Connection).Clone())
{
dbcon.Open();
Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore");
Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore");
m.Update();
dbcon.Close();
}
m_initialized = true;
}
@ -113,7 +108,7 @@ namespace OpenSim.Data.SQLite
}
finally
{
CloseCommand(cmd);
//CloseCommand(cmd);
}
return null;
@ -156,14 +151,14 @@ namespace OpenSim.Data.SQLite
{
if (ExecuteNonQuery(cmd, m_Connection) < 1)
{
CloseCommand(cmd);
//CloseCommand(cmd);
return false;
}
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
CloseCommand(cmd);
//CloseCommand(cmd);
return false;
}
}
@ -184,19 +179,19 @@ namespace OpenSim.Data.SQLite
{
if (ExecuteNonQuery(cmd, m_Connection) < 1)
{
CloseCommand(cmd);
//CloseCommand(cmd);
return false;
}
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
CloseCommand(cmd);
//CloseCommand(cmd);
return false;
}
}
CloseCommand(cmd);
//CloseCommand(cmd);
return true;
}

8
OpenSim/Data/SQLite/SQLiteAvatarData.cs
View File

@ -33,7 +33,7 @@ using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.SqliteClient;
using Mono.Data.Sqlite;
namespace OpenSim.Data.SQLite
{
@ -55,8 +55,8 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = :PrincipalID and `Name` = :Name", m_Realm);
cmd.Parameters.Add(":PrincipalID", principalID.ToString());
cmd.Parameters.Add(":Name", name);
cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
cmd.Parameters.AddWithValue(":Name", name);
try
{
@ -67,7 +67,7 @@ namespace OpenSim.Data.SQLite
}
finally
{
CloseCommand(cmd);
//CloseCommand(cmd);
}
}
}

48
OpenSim/Data/SQLite/SQLiteEstateData.cs
View File

@ -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;
@ -62,8 +62,8 @@ namespace OpenSim.Data.SQLite
Migration m = new Migration(m_connection, assem, "EstateStore");
m.Update();
m_connection.Close();
m_connection.Open();
//m_connection.Close();
// m_connection.Open();
Type t = typeof(EstateSettings);
m_Fields = t.GetFields(BindingFlags.NonPublic |
@ -87,7 +87,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = sql;
cmd.Parameters.Add(":RegionID", regionID.ToString());
cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
return DoLoad(cmd, regionID, create);
}
@ -143,13 +143,13 @@ namespace OpenSim.Data.SQLite
if (m_FieldMap[name].GetValue(es) is bool)
{
if ((bool)m_FieldMap[name].GetValue(es))
cmd.Parameters.Add(":"+name, "1");
cmd.Parameters.AddWithValue(":"+name, "1");
else
cmd.Parameters.Add(":"+name, "0");
cmd.Parameters.AddWithValue(":"+name, "0");
}
else
{
cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
}
}
@ -167,8 +167,8 @@ namespace OpenSim.Data.SQLite
r.Close();
cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
cmd.Parameters.Add(":RegionID", regionID.ToString());
cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
// This will throw on dupe key
try
@ -211,13 +211,13 @@ namespace OpenSim.Data.SQLite
if (m_FieldMap[name].GetValue(es) is bool)
{
if ((bool)m_FieldMap[name].GetValue(es))
cmd.Parameters.Add(":"+name, "1");
cmd.Parameters.AddWithValue(":"+name, "1");
else
cmd.Parameters.Add(":"+name, "0");
cmd.Parameters.AddWithValue(":"+name, "0");
}
else
{
cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
}
}
@ -236,7 +236,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
cmd.Parameters.Add(":EstateID", es.EstateID);
cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
IDataReader r = cmd.ExecuteReader();
@ -260,7 +260,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "delete from estateban where EstateID = :EstateID";
cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
cmd.ExecuteNonQuery();
@ -270,8 +270,8 @@ namespace OpenSim.Data.SQLite
foreach (EstateBan b in es.EstateBans)
{
cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
cmd.Parameters.Add(":bannedUUID", b.BannedUserID.ToString());
cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
cmd.Parameters.AddWithValue(":bannedUUID", b.BannedUserID.ToString());
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
@ -283,7 +283,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
cmd.Parameters.Add(":EstateID", EstateID.ToString());
cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
cmd.ExecuteNonQuery();
@ -293,8 +293,8 @@ namespace OpenSim.Data.SQLite
foreach (UUID uuid in data)
{
cmd.Parameters.Add(":EstateID", EstateID.ToString());
cmd.Parameters.Add(":uuid", uuid.ToString());
cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
cmd.Parameters.AddWithValue(":uuid", uuid.ToString());
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
@ -308,7 +308,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
cmd.Parameters.Add(":EstateID", EstateID);
cmd.Parameters.AddWithValue(":EstateID", EstateID);
IDataReader r = cmd.ExecuteReader();
@ -333,7 +333,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = sql;
cmd.Parameters.Add(":EstateID", estateID.ToString());
cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
return DoLoad(cmd, UUID.Zero, false);
}
@ -347,7 +347,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = sql;
cmd.Parameters.Add(":EstateName", search);
cmd.Parameters.AddWithValue(":EstateName", search);
IDataReader r = cmd.ExecuteReader();
@ -365,8 +365,8 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
cmd.Parameters.Add(":RegionID", regionID.ToString());
cmd.Parameters.Add(":EstateID", estateID.ToString());
cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
if (cmd.ExecuteNonQuery() == 0)
return false;

14
OpenSim/Data/SQLite/SQLiteFramework.cs
View File

@ -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
{
@ -55,11 +55,14 @@ namespace OpenSim.Data.SQLite
{
lock (connection)
{
/*
SqliteConnection newConnection =
(SqliteConnection)((ICloneable)connection).Clone();
newConnection.Open();
cmd.Connection = newConnection;
*/
cmd.Connection = connection;
//Console.WriteLine("XXX " + cmd.CommandText);
return cmd.ExecuteNonQuery();
@ -70,11 +73,12 @@ namespace OpenSim.Data.SQLite
{
lock (connection)
{
SqliteConnection newConnection =
(SqliteConnection)((ICloneable)connection).Clone();
newConnection.Open();
//SqliteConnection newConnection =
// (SqliteConnection)((ICloneable)connection).Clone();
//newConnection.Open();
cmd.Connection = newConnection;
//cmd.Connection = newConnection;
cmd.Connection = connection;
//Console.WriteLine("XXX " + cmd.CommandText);
return cmd.ExecuteReader();

8
OpenSim/Data/SQLite/SQLiteFriendsData.cs
View File

@ -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
{
@ -47,7 +47,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = :PrincipalID", m_Realm);
cmd.Parameters.Add(":PrincipalID", userID.ToString());
cmd.Parameters.AddWithValue(":PrincipalID", userID.ToString());
return DoQuery(cmd);
@ -58,8 +58,8 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
cmd.Parameters.Add(":PrincipalID", principalID.ToString());
cmd.Parameters.Add(":Friend", friend);
cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
cmd.Parameters.AddWithValue(":Friend", friend);
ExecuteNonQuery(cmd, cmd.Connection);

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

@ -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;
@ -59,19 +59,21 @@ namespace OpenSim.Data.SQLite
if (!m_initialized)
{
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();
//SqliteConnection newConnection =
// (SqliteConnection)((ICloneable)m_Connection).Clone();
//newConnection.Open();
Migration m = new Migration(newConnection, assem, storeName);
//Migration m = new Migration(newConnection, assem, storeName);
Migration m = new Migration(m_Connection, assem, storeName);
m.Update();
newConnection.Close();
newConnection.Dispose();
//newConnection.Close();
//newConnection.Dispose();
}
m_initialized = true;
@ -197,7 +199,7 @@ namespace OpenSim.Data.SQLite
result.Add(row);
}
CloseCommand(cmd);
//CloseCommand(cmd);
return result.ToArray();
}

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

@ -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;
@ -98,11 +98,13 @@ namespace OpenSim.Data.SQLite
ds.Tables.Add(createInventoryFoldersTable());
invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
setupFoldersCommands(invFoldersDa, conn);
CreateDataSetMapping(invFoldersDa, "inventoryfolders");
m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
ds.Tables.Add(createInventoryItemsTable());
invItemsDa.Fill(ds.Tables["inventoryitems"]);
setupItemsCommands(invItemsDa, conn);
CreateDataSetMapping(invItemsDa, "inventoryitems");
m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
ds.AcceptChanges();
@ -728,6 +730,15 @@ namespace OpenSim.Data.SQLite
*
**********************************************************************/
protected void CreateDataSetMapping(IDataAdapter da, string tableName)
{
ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
foreach (DataColumn col in ds.Tables[tableName].Columns)
{
dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
}
}
/// <summary>
/// Create the "inventoryitems" table
/// </summary>

93
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -32,7 +32,7 @@ using System.Drawing;
using System.IO;
using System.Reflection;
using log4net;
using Mono.Data.SqliteClient;
using Mono.Data.Sqlite;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
@ -86,20 +86,19 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="connectionString">the connection string</param>
public void Initialise(string connectionString)
{
try
{
m_connectionString = connectionString;
ds = new DataSet();
ds = new DataSet("Region");
m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
m_conn = new SqliteConnection(m_connectionString);
m_conn.Open();
SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
primDa = new SqliteDataAdapter(primSelectCmd);
// SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
shapeDa = new SqliteDataAdapter(shapeSelectCmd);
@ -128,14 +127,12 @@ namespace OpenSim.Data.SQLite
{
ds.Tables.Add(createPrimTable());
setupPrimCommands(primDa, m_conn);
primDa.Fill(ds.Tables["prims"]);
ds.Tables.Add(createShapeTable());
setupShapeCommands(shapeDa, m_conn);
ds.Tables.Add(createItemsTable());
setupItemsCommands(itemsDa, m_conn);
itemsDa.Fill(ds.Tables["primitems"]);
ds.Tables.Add(createTerrainTable());
setupTerrainCommands(terrainDa, m_conn);
@ -147,13 +144,21 @@ namespace OpenSim.Data.SQLite
setupLandAccessCommands(landAccessListDa, m_conn);
ds.Tables.Add(createRegionSettingsTable());
setupRegionSettingsCommands(regionSettingsDa, m_conn);
// WORKAROUND: This is a work around for sqlite on
// windows, which gets really unhappy with blob columns
// that have no sample data in them. At some point we
// need to actually find a proper way to handle this.
try
{
primDa.Fill(ds.Tables["prims"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on prims table");
}
try
{
shapeDa.Fill(ds.Tables["primshapes"]);
@ -198,9 +203,27 @@ namespace OpenSim.Data.SQLite
{
m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
}
return;
// We have to create a data set mapping for every table, otherwise the IDataAdaptor.Update() will not populate rows with values!
// Not sure exactly why this is - this kind of thing was not necessary before - justincc 20100409
// Possibly because we manually set up our own DataTables before connecting to the database
CreateDataSetMapping(primDa, "prims");
CreateDataSetMapping(shapeDa, "primshapes");
CreateDataSetMapping(itemsDa, "primitems");
CreateDataSetMapping(terrainDa, "terrain");
CreateDataSetMapping(landDa, "land");
CreateDataSetMapping(landAccessListDa, "landaccesslist");
CreateDataSetMapping(regionSettingsDa, "regionsettings");
}
}
catch (Exception e)
{
m_log.Error(e);
Environment.Exit(23);
}
return;
}
public void Dispose()
{
@ -603,7 +626,7 @@ namespace OpenSim.Data.SQLite
}
}
}
rev = (int) row["Revision"];
rev = Convert.ToInt32(row["Revision"]);
}
else
{
@ -755,6 +778,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
public void Commit()
{
m_log.Debug("[SQLITE]: Starting commit");
lock (ds)
{
primDa.Update(ds, "prims");
@ -769,19 +793,12 @@ namespace OpenSim.Data.SQLite
{
regionSettingsDa.Update(ds, "regionsettings");
}
catch (SqliteExecutionException SqlEx)
{
if (SqlEx.Message.Contains("logic error"))
catch (SqliteException SqlEx)
{
throw new Exception(
"There was a SQL error or connection string configuration error when saving the region settings. This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder. This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set. If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
SqlEx);
}
else
{
throw SqlEx;
}
}
ds.AcceptChanges();
}
}
@ -802,6 +819,15 @@ namespace OpenSim.Data.SQLite
*
**********************************************************************/
protected void CreateDataSetMapping(IDataAdapter da, string tableName)
{
ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
foreach (DataColumn col in ds.Tables[tableName].Columns)
{
dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
}
}
/// <summary>
///
/// </summary>
@ -1964,6 +1990,7 @@ namespace OpenSim.Data.SQLite
sql += ") values (:";
sql += String.Join(", :", cols);
sql += ")";
m_log.DebugFormat("[SQLITE]: Created insert command {0}", sql);
SqliteCommand cmd = new SqliteCommand(sql);
// this provides the binding for all our parameters, so
@ -2260,5 +2287,35 @@ namespace OpenSim.Data.SQLite
}
}
static void PrintDataSet(DataSet ds)
{
// Print out any name and extended properties.
Console.WriteLine("DataSet is named: {0}", ds.DataSetName);
foreach (System.Collections.DictionaryEntry de in ds.ExtendedProperties)
{
Console.WriteLine("Key = {0}, Value = {1}", de.Key, de.Value);
}
Console.WriteLine();
foreach (DataTable dt in ds.Tables)
{
Console.WriteLine("=> {0} Table:", dt.TableName);
// Print out the column names.
for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
{
Console.Write(dt.Columns[curCol].ColumnName + "\t");
}
Console.WriteLine("\n----------------------------------");
// Print the DataTable.
for (int curRow = 0; curRow < dt.Rows.Count; curRow++)
{
for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
{
Console.Write(dt.Rows[curRow][curCol].ToString() + "\t");
}
Console.WriteLine();
}
}
}
}
}

4
OpenSim/Data/SQLite/SQLiteUserAccountData.cs
View File

@ -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
{
@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLite
if (words.Length == 1)
{
cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
cmd.CommandText = String.Format("select * from {0} where ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
m_Realm, scopeID.ToString(), words[0]);
}
else

2
OpenSim/Data/SQLite/SQLiteUtils.cs
View File

@ -27,7 +27,7 @@
using System;
using System.Data;
using Mono.Data.SqliteClient;
using Mono.Data.Sqlite;
namespace OpenSim.Data.SQLite
{

4
OpenSim/Data/SQLite/SQLiteXInventoryData.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Data;
using System.Reflection;
using System.Collections.Generic;
using Mono.Data.SqliteClient;
using Mono.Data.Sqlite;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLite
}
reader.Close();
CloseCommand(cmd);
//CloseCommand(cmd);
return perms;
}

4
OpenSim/Data/SQLiteNG/Properties/AssemblyInfo.cs → OpenSim/Data/SQLiteLegacy/Properties/AssemblyInfo.cs
View File

@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly : AssemblyTitle("OpenSim.Data.SQLiteNG")]
[assembly : AssemblyTitle("OpenSim.Data.SQLiteLegacy")]
[assembly : AssemblyDescription("")]
[assembly : AssemblyConfiguration("")]
[assembly : AssemblyCompany("http://opensimulator.org")]
[assembly : AssemblyProduct("OpenSim.Data.SQLiteNG")]
[assembly : AssemblyProduct("OpenSim.Data.SQLiteLegacy")]
[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
[assembly : AssemblyTrademark("")]
[assembly : AssemblyCulture("")]

0
OpenSim/Data/SQLiteNG/Resources/001_AssetStore.sql → OpenSim/Data/SQLiteLegacy/Resources/001_AssetStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/001_AuthStore.sql → OpenSim/Data/SQLiteLegacy/Resources/001_AuthStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/001_Avatar.sql → OpenSim/Data/SQLiteLegacy/Resources/001_Avatar.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/001_FriendsStore.sql → OpenSim/Data/SQLiteLegacy/Resources/001_FriendsStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/001_InventoryStore.sql → OpenSim/Data/SQLiteLegacy/Resources/001_InventoryStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/001_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/001_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/001_UserAccount.sql → OpenSim/Data/SQLiteLegacy/Resources/001_UserAccount.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/001_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/001_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/002_AssetStore.sql → OpenSim/Data/SQLiteLegacy/Resources/002_AssetStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/002_AuthStore.sql → OpenSim/Data/SQLiteLegacy/Resources/002_AuthStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/002_FriendsStore.sql → OpenSim/Data/SQLiteLegacy/Resources/002_FriendsStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/002_InventoryStore.sql → OpenSim/Data/SQLiteLegacy/Resources/002_InventoryStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/002_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/002_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/002_UserAccount.sql → OpenSim/Data/SQLiteLegacy/Resources/002_UserAccount.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/002_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/002_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/003_AssetStore.sql → OpenSim/Data/SQLiteLegacy/Resources/003_AssetStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/003_InventoryStore.sql → OpenSim/Data/SQLiteLegacy/Resources/003_InventoryStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/003_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/003_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/003_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/003_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/004_AssetStore.sql → OpenSim/Data/SQLiteLegacy/Resources/004_AssetStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/004_InventoryStore.sql → OpenSim/Data/SQLiteLegacy/Resources/004_InventoryStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/004_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/004_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/004_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/004_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/005_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/005_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/005_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/005_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/006_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/006_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/006_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/006_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/007_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/007_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/007_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/007_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/008_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/008_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/008_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/008_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/009_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/009_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/009_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/009_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/010_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/010_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/010_UserStore.sql → OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/011_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/011_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/012_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/012_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/013_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/013_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/014_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/014_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/015_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/015_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/016_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/016_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/017_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/017_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/018_RegionStore.sql → OpenSim/Data/SQLiteLegacy/Resources/018_RegionStore.sql
View File

0
OpenSim/Data/SQLiteNG/Resources/OpenSim.Data.SQLite.addin.xml → OpenSim/Data/SQLiteLegacy/Resources/OpenSim.Data.SQLite.addin.xml
View File

4
OpenSim/Data/SQLiteNG/SQLiteAssetData.cs → OpenSim/Data/SQLiteLegacy/SQLiteAssetData.cs
View File

@ -30,11 +30,11 @@ using System.Data;
using System.Reflection;
using System.Collections.Generic;
using log4net;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
/// <summary>
/// An asset storage interface for the SQLite database system

23
OpenSim/Data/SQLiteNG/SQLiteAuthenticationData.cs → OpenSim/Data/SQLiteLegacy/SQLiteAuthenticationData.cs
View File

@ -31,9 +31,9 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
public class SQLiteAuthenticationData : SQLiteFramework, IAuthenticationData
{
@ -56,8 +56,13 @@ namespace OpenSim.Data.SQLiteNG
m_Connection = new SqliteConnection(connectionString);
m_Connection.Open();
Migration m = new Migration(m_Connection, GetType().Assembly, "AuthStore");
using (SqliteConnection dbcon = (SqliteConnection)((ICloneable)m_Connection).Clone())
{
dbcon.Open();
Migration m = new Migration(dbcon, GetType().Assembly, "AuthStore");
m.Update();
dbcon.Close();
}
m_initialized = true;
}
@ -108,7 +113,7 @@ namespace OpenSim.Data.SQLiteNG
}
finally
{
//CloseCommand(cmd);
CloseCommand(cmd);
}
return null;
@ -151,14 +156,14 @@ namespace OpenSim.Data.SQLiteNG
{
if (ExecuteNonQuery(cmd, m_Connection) < 1)
{
//CloseCommand(cmd);
CloseCommand(cmd);
return false;
}
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
//CloseCommand(cmd);
CloseCommand(cmd);
return false;
}
}
@ -179,19 +184,19 @@ namespace OpenSim.Data.SQLiteNG
{
if (ExecuteNonQuery(cmd, m_Connection) < 1)
{
//CloseCommand(cmd);
CloseCommand(cmd);
return false;
}
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
//CloseCommand(cmd);
CloseCommand(cmd);
return false;
}
}
//CloseCommand(cmd);
CloseCommand(cmd);
return true;
}

10
OpenSim/Data/SQLiteNG/SQLiteAvatarData.cs → OpenSim/Data/SQLiteLegacy/SQLiteAvatarData.cs
View File

@ -33,9 +33,9 @@ using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
/// <summary>
/// A SQLite Interface for Avatar Data
@ -55,8 +55,8 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("delete from {0} where `PrincipalID` = :PrincipalID and `Name` = :Name", m_Realm);
cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
cmd.Parameters.AddWithValue(":Name", name);
cmd.Parameters.Add(":PrincipalID", principalID.ToString());
cmd.Parameters.Add(":Name", name);
try
{
@ -67,7 +67,7 @@ namespace OpenSim.Data.SQLiteNG
}
finally
{
//CloseCommand(cmd);
CloseCommand(cmd);
}
}
}

50
OpenSim/Data/SQLiteNG/SQLiteEstateData.cs → OpenSim/Data/SQLiteLegacy/SQLiteEstateData.cs
View File

@ -30,12 +30,12 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
public class SQLiteEstateStore : IEstateDataStore
{
@ -62,8 +62,8 @@ namespace OpenSim.Data.SQLiteNG
Migration m = new Migration(m_connection, assem, "EstateStore");
m.Update();
//m_connection.Close();
// m_connection.Open();
m_connection.Close();
m_connection.Open();
Type t = typeof(EstateSettings);
m_Fields = t.GetFields(BindingFlags.NonPublic |
@ -87,7 +87,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = sql;
cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
cmd.Parameters.Add(":RegionID", regionID.ToString());
return DoLoad(cmd, regionID, create);
}
@ -143,13 +143,13 @@ namespace OpenSim.Data.SQLiteNG
if (m_FieldMap[name].GetValue(es) is bool)
{
if ((bool)m_FieldMap[name].GetValue(es))
cmd.Parameters.AddWithValue(":"+name, "1");
cmd.Parameters.Add(":"+name, "1");
else
cmd.Parameters.AddWithValue(":"+name, "0");
cmd.Parameters.Add(":"+name, "0");
}
else
{
cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
}
}
@ -167,8 +167,8 @@ namespace OpenSim.Data.SQLiteNG
r.Close();
cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
cmd.Parameters.Add(":RegionID", regionID.ToString());
cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
// This will throw on dupe key
try
@ -211,13 +211,13 @@ namespace OpenSim.Data.SQLiteNG
if (m_FieldMap[name].GetValue(es) is bool)
{
if ((bool)m_FieldMap[name].GetValue(es))
cmd.Parameters.AddWithValue(":"+name, "1");
cmd.Parameters.Add(":"+name, "1");
else
cmd.Parameters.AddWithValue(":"+name, "0");
cmd.Parameters.Add(":"+name, "0");
}
else
{
cmd.Parameters.AddWithValue(":"+name, m_FieldMap[name].GetValue(es).ToString());
cmd.Parameters.Add(":"+name, m_FieldMap[name].GetValue(es).ToString());
}
}
@ -236,7 +236,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "select bannedUUID from estateban where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
cmd.Parameters.Add(":EstateID", es.EstateID);
IDataReader r = cmd.ExecuteReader();
@ -260,7 +260,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "delete from estateban where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
cmd.ExecuteNonQuery();
@ -270,8 +270,8 @@ namespace OpenSim.Data.SQLiteNG
foreach (EstateBan b in es.EstateBans)
{
cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
cmd.Parameters.AddWithValue(":bannedUUID", b.BannedUserID.ToString());
cmd.Parameters.Add(":EstateID", es.EstateID.ToString());
cmd.Parameters.Add(":bannedUUID", b.BannedUserID.ToString());
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
@ -283,7 +283,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
cmd.Parameters.Add(":EstateID", EstateID.ToString());
cmd.ExecuteNonQuery();
@ -293,8 +293,8 @@ namespace OpenSim.Data.SQLiteNG
foreach (UUID uuid in data)
{
cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
cmd.Parameters.AddWithValue(":uuid", uuid.ToString());
cmd.Parameters.Add(":EstateID", EstateID.ToString());
cmd.Parameters.Add(":uuid", uuid.ToString());
cmd.ExecuteNonQuery();
cmd.Parameters.Clear();
@ -308,7 +308,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", EstateID);
cmd.Parameters.Add(":EstateID", EstateID);
IDataReader r = cmd.ExecuteReader();
@ -333,7 +333,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = sql;
cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
cmd.Parameters.Add(":EstateID", estateID.ToString());
return DoLoad(cmd, UUID.Zero, false);
}
@ -347,7 +347,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = sql;
cmd.Parameters.AddWithValue(":EstateName", search);
cmd.Parameters.Add(":EstateName", search);
IDataReader r = cmd.ExecuteReader();
@ -365,8 +365,8 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand();
cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
cmd.Parameters.Add(":RegionID", regionID.ToString());
cmd.Parameters.Add(":EstateID", estateID.ToString());
if (cmd.ExecuteNonQuery() == 0)
return false;

16
OpenSim/Data/SQLiteNG/SQLiteFramework.cs → OpenSim/Data/SQLiteLegacy/SQLiteFramework.cs
View File

@ -31,9 +31,9 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
/// <summary>
/// A database interface class to a user profile storage system
@ -55,14 +55,11 @@ namespace OpenSim.Data.SQLiteNG
{
lock (connection)
{
/*
SqliteConnection newConnection =
(SqliteConnection)((ICloneable)connection).Clone();
newConnection.Open();
cmd.Connection = newConnection;
*/
cmd.Connection = connection;
//Console.WriteLine("XXX " + cmd.CommandText);
return cmd.ExecuteNonQuery();
@ -73,12 +70,11 @@ namespace OpenSim.Data.SQLiteNG
{
lock (connection)
{
//SqliteConnection newConnection =
// (SqliteConnection)((ICloneable)connection).Clone();
//newConnection.Open();
SqliteConnection newConnection =
(SqliteConnection)((ICloneable)connection).Clone();
newConnection.Open();
//cmd.Connection = newConnection;
cmd.Connection = connection;
cmd.Connection = newConnection;
//Console.WriteLine("XXX " + cmd.CommandText);
return cmd.ExecuteReader();

10
OpenSim/Data/SQLiteNG/SQLiteFriendsData.cs → OpenSim/Data/SQLiteLegacy/SQLiteFriendsData.cs
View File

@ -31,9 +31,9 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
public class SQLiteFriendsData : SQLiteGenericTableHandler<FriendsData>, IFriendsData
{
@ -47,7 +47,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = :PrincipalID", m_Realm);
cmd.Parameters.AddWithValue(":PrincipalID", userID.ToString());
cmd.Parameters.Add(":PrincipalID", userID.ToString());
return DoQuery(cmd);
@ -58,8 +58,8 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
cmd.Parameters.AddWithValue(":Friend", friend);
cmd.Parameters.Add(":PrincipalID", principalID.ToString());
cmd.Parameters.Add(":Friend", friend);
ExecuteNonQuery(cmd, cmd.Connection);

20
OpenSim/Data/SQLiteNG/SQLiteGenericTableHandler.cs → OpenSim/Data/SQLiteLegacy/SQLiteGenericTableHandler.cs
View File

@ -30,12 +30,12 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
public class SQLiteGenericTableHandler<T> : SQLiteFramework where T: class, new()
{
@ -59,21 +59,19 @@ namespace OpenSim.Data.SQLiteNG
if (!m_initialized)
{
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();
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, assem, storeName);
m.Update();
//newConnection.Close();
//newConnection.Dispose();
newConnection.Close();
newConnection.Dispose();
}
m_initialized = true;
@ -199,7 +197,7 @@ namespace OpenSim.Data.SQLiteNG
result.Add(row);
}
//CloseCommand(cmd);
CloseCommand(cmd);
return result.ToArray();
}

15
OpenSim/Data/SQLiteNG/SQLiteInventoryStore.cs → OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
View File

@ -30,11 +30,11 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
/// <summary>
/// An Inventory Interface to the SQLite database
@ -98,13 +98,11 @@ namespace OpenSim.Data.SQLiteNG
ds.Tables.Add(createInventoryFoldersTable());
invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
setupFoldersCommands(invFoldersDa, conn);
CreateDataSetMapping(invFoldersDa, "inventoryfolders");
m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
ds.Tables.Add(createInventoryItemsTable());
invItemsDa.Fill(ds.Tables["inventoryitems"]);
setupItemsCommands(invItemsDa, conn);
CreateDataSetMapping(invItemsDa, "inventoryitems");
m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
ds.AcceptChanges();
@ -730,15 +728,6 @@ namespace OpenSim.Data.SQLiteNG
*
**********************************************************************/
protected void CreateDataSetMapping(IDataAdapter da, string tableName)
{
ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
foreach (DataColumn col in ds.Tables[tableName].Columns)
{
dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
}
}
/// <summary>
/// Create the "inventoryitems" table
/// </summary>

95
OpenSim/Data/SQLiteNG/SQLiteRegionData.cs → OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
View File

@ -32,13 +32,13 @@ using System.Drawing;
using System.IO;
using System.Reflection;
using log4net;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
/// <summary>
/// A RegionData Interface to the SQLite database
@ -86,19 +86,20 @@ namespace OpenSim.Data.SQLiteNG
/// </summary>
/// <param name="connectionString">the connection string</param>
public void Initialise(string connectionString)
{
try
{
m_connectionString = connectionString;
ds = new DataSet("Region");
ds = new DataSet();
m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
m_conn = new SqliteConnection(m_connectionString);
m_conn.Open();
SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
primDa = new SqliteDataAdapter(primSelectCmd);
// SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
shapeDa = new SqliteDataAdapter(shapeSelectCmd);
@ -127,12 +128,14 @@ namespace OpenSim.Data.SQLiteNG
{
ds.Tables.Add(createPrimTable());
setupPrimCommands(primDa, m_conn);
primDa.Fill(ds.Tables["prims"]);
ds.Tables.Add(createShapeTable());
setupShapeCommands(shapeDa, m_conn);
ds.Tables.Add(createItemsTable());
setupItemsCommands(itemsDa, m_conn);
itemsDa.Fill(ds.Tables["primitems"]);
ds.Tables.Add(createTerrainTable());
setupTerrainCommands(terrainDa, m_conn);
@ -144,21 +147,13 @@ namespace OpenSim.Data.SQLiteNG
setupLandAccessCommands(landAccessListDa, m_conn);
ds.Tables.Add(createRegionSettingsTable());
setupRegionSettingsCommands(regionSettingsDa, m_conn);
// WORKAROUND: This is a work around for sqlite on
// windows, which gets really unhappy with blob columns
// that have no sample data in them. At some point we
// need to actually find a proper way to handle this.
try
{
primDa.Fill(ds.Tables["prims"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on prims table");
}
try
{
shapeDa.Fill(ds.Tables["primshapes"]);
@ -203,27 +198,9 @@ namespace OpenSim.Data.SQLiteNG
{
m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
}
// We have to create a data set mapping for every table, otherwise the IDataAdaptor.Update() will not populate rows with values!
// Not sure exactly why this is - this kind of thing was not necessary before - justincc 20100409
// Possibly because we manually set up our own DataTables before connecting to the database
CreateDataSetMapping(primDa, "prims");
CreateDataSetMapping(shapeDa, "primshapes");
CreateDataSetMapping(itemsDa, "primitems");
CreateDataSetMapping(terrainDa, "terrain");
CreateDataSetMapping(landDa, "land");
CreateDataSetMapping(landAccessListDa, "landaccesslist");
CreateDataSetMapping(regionSettingsDa, "regionsettings");
}
}
catch (Exception e)
{
m_log.Error(e);
Environment.Exit(23);
}
return;
}
}
public void Dispose()
{
@ -626,7 +603,7 @@ namespace OpenSim.Data.SQLiteNG
}
}
}
rev = Convert.ToInt32(row["Revision"]);
rev = (int) row["Revision"];
}
else
{
@ -778,7 +755,6 @@ namespace OpenSim.Data.SQLiteNG
/// </summary>
public void Commit()
{
m_log.Debug("[SQLITE]: Starting commit");
lock (ds)
{
primDa.Update(ds, "prims");
@ -793,12 +769,19 @@ namespace OpenSim.Data.SQLiteNG
{
regionSettingsDa.Update(ds, "regionsettings");
}
catch (SqliteException SqlEx)
catch (SqliteExecutionException SqlEx)
{
if (SqlEx.Message.Contains("logic error"))
{
throw new Exception(
"There was a SQL error or connection string configuration error when saving the region settings. This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder. This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set. If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
SqlEx);
}
else
{
throw SqlEx;
}
}
ds.AcceptChanges();
}
}
@ -819,15 +802,6 @@ namespace OpenSim.Data.SQLiteNG
*
**********************************************************************/
protected void CreateDataSetMapping(IDataAdapter da, string tableName)
{
ITableMapping dbMapping = da.TableMappings.Add(tableName, tableName);
foreach (DataColumn col in ds.Tables[tableName].Columns)
{
dbMapping.ColumnMappings.Add(col.ColumnName, col.ColumnName);
}
}
/// <summary>
///
/// </summary>
@ -1990,7 +1964,6 @@ namespace OpenSim.Data.SQLiteNG
sql += ") values (:";
sql += String.Join(", :", cols);
sql += ")";
m_log.DebugFormat("[SQLITE]: Created insert command {0}", sql);
SqliteCommand cmd = new SqliteCommand(sql);
// this provides the binding for all our parameters, so
@ -2287,35 +2260,5 @@ namespace OpenSim.Data.SQLiteNG
}
}
static void PrintDataSet(DataSet ds)
{
// Print out any name and extended properties.
Console.WriteLine("DataSet is named: {0}", ds.DataSetName);
foreach (System.Collections.DictionaryEntry de in ds.ExtendedProperties)
{
Console.WriteLine("Key = {0}, Value = {1}", de.Key, de.Value);
}
Console.WriteLine();
foreach (DataTable dt in ds.Tables)
{
Console.WriteLine("=> {0} Table:", dt.TableName);
// Print out the column names.
for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
{
Console.Write(dt.Columns[curCol].ColumnName + "\t");
}
Console.WriteLine("\n----------------------------------");
// Print the DataTable.
for (int curRow = 0; curRow < dt.Rows.Count; curRow++)
{
for (int curCol = 0; curCol < dt.Columns.Count; curCol++)
{
Console.Write(dt.Rows[curRow][curCol].ToString() + "\t");
}
Console.WriteLine();
}
}
}
}
}

6
OpenSim/Data/SQLiteNG/SQLiteUserAccountData.cs → OpenSim/Data/SQLiteLegacy/SQLiteUserAccountData.cs
View File

@ -31,9 +31,9 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
public class SQLiteUserAccountData : SQLiteGenericTableHandler<UserAccountData>, IUserAccountData
{
@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLiteNG
if (words.Length == 1)
{
cmd.CommandText = String.Format("select * from {0} where ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')",
m_Realm, scopeID.ToString(), words[0]);
}
else

4
OpenSim/Data/SQLiteNG/SQLiteUtils.cs → OpenSim/Data/SQLiteLegacy/SQLiteUtils.cs
View File

@ -27,9 +27,9 @@
using System;
using System.Data;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
/// <summary>
/// A base class for methods needed by all SQLite database classes

6
OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs → OpenSim/Data/SQLiteLegacy/SQLiteXInventoryData.cs
View File

@ -29,12 +29,12 @@ using System;
using System.Data;
using System.Reflection;
using System.Collections.Generic;
using Mono.Data.Sqlite;
using Mono.Data.SqliteClient;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.SQLiteNG
namespace OpenSim.Data.SQLiteLegacy
{
/// <summary>
/// A MySQL Interface for the Asset Server
@ -147,7 +147,7 @@ namespace OpenSim.Data.SQLiteNG
}
reader.Close();
//CloseCommand(cmd);
CloseCommand(cmd);
return perms;
}

3
OpenSim/Data/Tests/DataTestUtil.cs
View File

@ -39,7 +39,8 @@ namespace OpenSim.Data.Tests
public class DataTestUtil
{
public const uint UNSIGNED_INTEGER_MIN = uint.MinValue;
public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue;
//public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue;
public const uint UNSIGNED_INTEGER_MAX = INTEGER_MAX;
public const int INTEGER_MIN = int.MinValue + 1; // Postgresql requires +1 to .NET int.MinValue
public const int INTEGER_MAX = int.MaxValue;

10
bin/OpenSim.ini.example
View File

@ -113,14 +113,14 @@
; --- To use sqlite as region storage:
;
; PLEASE NOTE: Unfortunately, the SQLiteNG database plugin, while necessary to use sqlite with Mono on Linux, is
; PLEASE NOTE: Unfortunately, the current SQLite database plugin (necessary to use SQLite with Mono on Linux) is
; not compatible with the sqlite3 library installed on Mac OSX. If you're using Mono 2.4 you can still use the old sqlite
; library by uncommenting the SQLite.dll storage plugin (and commenting out SQLiteNG). Unfortunately, the older library
; will not work with Mono 2.6 on Mac OSX so you will either need to replace the sqlite3 system library or use MySQL instead
; library by uncommenting the SQLiteLegacy.dll storage plugin (and commenting out SQLite.dll). Unfortunately, the older library
; will not work with Mono 2.6 on Mac OSX so you will either need to replace the OSX sqlite3 system library or use MySQL instead
;
; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode
storage_plugin = "OpenSim.Data.SQLiteNG.dll"
;storage_plugin = "OpenSim.Data.SQLite.dll"
storage_plugin = "OpenSim.Data.SQLite.dll"
;storage_plugin = "OpenSim.Data.SQLiteLegacy.dll"
storage_connection_string="URI=file:OpenSim.db,version=3";
; --- To use MySQL storage, supply your own connection string (this is only an example):

8
bin/config-include/StandaloneCommon.ini.example
View File

@ -6,12 +6,12 @@
;
; SQLite
Include-Storage = "config-include/storage/SQLiteNGStandalone.ini";
Include-Storage = "config-include/storage/SQLiteStandalone.ini";
; Unfortunately SQLiteNG is not compatible with Mac OSX. You can still use the older
; sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini for sqlite
; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older
; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite)
; for more details
;Include-Storage = "config-include/storage/SQLiteStandalone.ini";
;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
; MySql
; Uncomment these lines if you want to use mysql storage

2
bin/config-include/storage/SQLiteNGStandalone.ini → bin/config-include/storage/SQLiteLegacyStandalone.ini
View File

@ -1,7 +1,7 @@
; These are the initialization settings for running OpenSim Standalone with an SQLite database
[DatabaseService]
StorageProvider = "OpenSim.Data.SQLiteNG.dll"
StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
[AvatarService]
ConnectionString = "URI=file:avatars.db,version=3"

4
prebuild.xml
View File

@ -2178,7 +2178,7 @@
</Files>
</Project>
<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteLegacy" path="OpenSim/Data/SQLiteLegacy" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
@ -2215,7 +2215,7 @@
</Files>
</Project>
<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library">
<Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>