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

View File

@ -30,7 +30,7 @@ using System.Data;
using System.Reflection; using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
using log4net; using log4net;
using Mono.Data.SqliteClient; using Mono.Data.Sqlite;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
@ -137,7 +137,7 @@ namespace OpenSim.Data.SQLite
cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local)); cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary)); cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -340,4 +340,4 @@ namespace OpenSim.Data.SQLite
#endregion #endregion
} }
} }

View File

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

View File

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

View File

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

View File

@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using Mono.Data.SqliteClient; using Mono.Data.Sqlite;
namespace OpenSim.Data.SQLite namespace OpenSim.Data.SQLite
{ {
@ -55,11 +55,14 @@ namespace OpenSim.Data.SQLite
{ {
lock (connection) lock (connection)
{ {
/*
SqliteConnection newConnection = SqliteConnection newConnection =
(SqliteConnection)((ICloneable)connection).Clone(); (SqliteConnection)((ICloneable)connection).Clone();
newConnection.Open(); newConnection.Open();
cmd.Connection = newConnection; cmd.Connection = newConnection;
*/
cmd.Connection = connection;
//Console.WriteLine("XXX " + cmd.CommandText); //Console.WriteLine("XXX " + cmd.CommandText);
return cmd.ExecuteNonQuery(); return cmd.ExecuteNonQuery();
@ -70,11 +73,12 @@ namespace OpenSim.Data.SQLite
{ {
lock (connection) lock (connection)
{ {
SqliteConnection newConnection = //SqliteConnection newConnection =
(SqliteConnection)((ICloneable)connection).Clone(); // (SqliteConnection)((ICloneable)connection).Clone();
newConnection.Open(); //newConnection.Open();
cmd.Connection = newConnection; //cmd.Connection = newConnection;
cmd.Connection = connection;
//Console.WriteLine("XXX " + cmd.CommandText); //Console.WriteLine("XXX " + cmd.CommandText);
return cmd.ExecuteReader(); return cmd.ExecuteReader();

View File

@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using Mono.Data.SqliteClient; using Mono.Data.Sqlite;
namespace OpenSim.Data.SQLite namespace OpenSim.Data.SQLite
{ {
@ -47,7 +47,7 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = new SqliteCommand(); 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.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); return DoQuery(cmd);
@ -58,8 +58,8 @@ namespace OpenSim.Data.SQLite
SqliteCommand cmd = new SqliteCommand(); SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm); cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
cmd.Parameters.Add(":PrincipalID", principalID.ToString()); cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString());
cmd.Parameters.Add(":Friend", friend); cmd.Parameters.AddWithValue(":Friend", friend);
ExecuteNonQuery(cmd, cmd.Connection); ExecuteNonQuery(cmd, cmd.Connection);

View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Mono.Data.SqliteClient; using Mono.Data.Sqlite;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
@ -59,19 +59,21 @@ namespace OpenSim.Data.SQLite
if (!m_initialized) if (!m_initialized)
{ {
m_Connection = new SqliteConnection(connectionString); m_Connection = new SqliteConnection(connectionString);
Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
m_Connection.Open(); m_Connection.Open();
if (storeName != String.Empty) if (storeName != String.Empty)
{ {
Assembly assem = GetType().Assembly; Assembly assem = GetType().Assembly;
SqliteConnection newConnection = //SqliteConnection newConnection =
(SqliteConnection)((ICloneable)m_Connection).Clone(); // (SqliteConnection)((ICloneable)m_Connection).Clone();
newConnection.Open(); //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(); m.Update();
newConnection.Close(); //newConnection.Close();
newConnection.Dispose(); //newConnection.Dispose();
} }
m_initialized = true; m_initialized = true;
@ -197,7 +199,7 @@ namespace OpenSim.Data.SQLite
result.Add(row); result.Add(row);
} }
CloseCommand(cmd); //CloseCommand(cmd);
return result.ToArray(); return result.ToArray();
} }

View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Mono.Data.SqliteClient; using Mono.Data.Sqlite;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
@ -98,11 +98,13 @@ namespace OpenSim.Data.SQLite
ds.Tables.Add(createInventoryFoldersTable()); ds.Tables.Add(createInventoryFoldersTable());
invFoldersDa.Fill(ds.Tables["inventoryfolders"]); invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
setupFoldersCommands(invFoldersDa, conn); setupFoldersCommands(invFoldersDa, conn);
CreateDataSetMapping(invFoldersDa, "inventoryfolders");
m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions"); m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
ds.Tables.Add(createInventoryItemsTable()); ds.Tables.Add(createInventoryItemsTable());
invItemsDa.Fill(ds.Tables["inventoryitems"]); invItemsDa.Fill(ds.Tables["inventoryitems"]);
setupItemsCommands(invItemsDa, conn); setupItemsCommands(invItemsDa, conn);
CreateDataSetMapping(invItemsDa, "inventoryitems");
m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions"); m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
ds.AcceptChanges(); 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> /// <summary>
/// Create the "inventoryitems" table /// Create the "inventoryitems" table
/// </summary> /// </summary>

View File

@ -32,7 +32,7 @@ using System.Drawing;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Mono.Data.SqliteClient; using Mono.Data.Sqlite;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
@ -87,119 +87,142 @@ namespace OpenSim.Data.SQLite
/// <param name="connectionString">the connection string</param> /// <param name="connectionString">the connection string</param>
public void Initialise(string connectionString) public void Initialise(string connectionString)
{ {
m_connectionString = connectionString; try
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);
// SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn);
itemsDa = new SqliteDataAdapter(itemsSelectCmd);
SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
terrainDa = new SqliteDataAdapter(terrainSelectCmd);
SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
landDa = new SqliteDataAdapter(landSelectCmd);
SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
// This actually does the roll forward assembly stuff
Assembly assem = GetType().Assembly;
Migration m = new Migration(m_conn, assem, "RegionStore");
m.Update();
lock (ds)
{ {
ds.Tables.Add(createPrimTable()); m_connectionString = connectionString;
setupPrimCommands(primDa, m_conn);
primDa.Fill(ds.Tables["prims"]);
ds.Tables.Add(createShapeTable()); ds = new DataSet("Region");
setupShapeCommands(shapeDa, m_conn);
ds.Tables.Add(createItemsTable()); m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString);
setupItemsCommands(itemsDa, m_conn); m_conn = new SqliteConnection(m_connectionString);
itemsDa.Fill(ds.Tables["primitems"]); m_conn.Open();
ds.Tables.Add(createTerrainTable()); SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
setupTerrainCommands(terrainDa, m_conn); primDa = new SqliteDataAdapter(primSelectCmd);
ds.Tables.Add(createLandTable()); SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
setupLandCommands(landDa, m_conn); shapeDa = new SqliteDataAdapter(shapeSelectCmd);
// SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
ds.Tables.Add(createLandAccessListTable()); SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn);
setupLandAccessCommands(landAccessListDa, m_conn); itemsDa = new SqliteDataAdapter(itemsSelectCmd);
ds.Tables.Add(createRegionSettingsTable()); SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
terrainDa = new SqliteDataAdapter(terrainSelectCmd);
setupRegionSettingsCommands(regionSettingsDa, m_conn);
// WORKAROUND: This is a work around for sqlite on SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
// windows, which gets really unhappy with blob columns landDa = new SqliteDataAdapter(landSelectCmd);
// that have no sample data in them. At some point we
// need to actually find a proper way to handle this. SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
try landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
// This actually does the roll forward assembly stuff
Assembly assem = GetType().Assembly;
Migration m = new Migration(m_conn, assem, "RegionStore");
m.Update();
lock (ds)
{ {
shapeDa.Fill(ds.Tables["primshapes"]); ds.Tables.Add(createPrimTable());
} setupPrimCommands(primDa, m_conn);
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on primshapes table");
}
try ds.Tables.Add(createShapeTable());
{ setupShapeCommands(shapeDa, m_conn);
terrainDa.Fill(ds.Tables["terrain"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on terrain table");
}
try ds.Tables.Add(createItemsTable());
{ setupItemsCommands(itemsDa, m_conn);
landDa.Fill(ds.Tables["land"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on land table");
}
try ds.Tables.Add(createTerrainTable());
{ setupTerrainCommands(terrainDa, m_conn);
landAccessListDa.Fill(ds.Tables["landaccesslist"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
}
try ds.Tables.Add(createLandTable());
{ setupLandCommands(landDa, m_conn);
regionSettingsDa.Fill(ds.Tables["regionsettings"]);
ds.Tables.Add(createLandAccessListTable());
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"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on primshapes table");
}
try
{
terrainDa.Fill(ds.Tables["terrain"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on terrain table");
}
try
{
landDa.Fill(ds.Tables["land"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on land table");
}
try
{
landAccessListDa.Fill(ds.Tables["landaccesslist"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
}
try
{
regionSettingsDa.Fill(ds.Tables["regionsettings"]);
}
catch (Exception)
{
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)
{
m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
}
return;
} }
catch (Exception e)
{
m_log.Error(e);
Environment.Exit(23);
}
return;
} }
public void Dispose() public void Dispose()
@ -603,7 +626,7 @@ namespace OpenSim.Data.SQLite
} }
} }
} }
rev = (int) row["Revision"]; rev = Convert.ToInt32(row["Revision"]);
} }
else else
{ {
@ -755,6 +778,7 @@ namespace OpenSim.Data.SQLite
/// </summary> /// </summary>
public void Commit() public void Commit()
{ {
m_log.Debug("[SQLITE]: Starting commit");
lock (ds) lock (ds)
{ {
primDa.Update(ds, "prims"); primDa.Update(ds, "prims");
@ -769,18 +793,11 @@ namespace OpenSim.Data.SQLite
{ {
regionSettingsDa.Update(ds, "regionsettings"); regionSettingsDa.Update(ds, "regionsettings");
} }
catch (SqliteExecutionException SqlEx) catch (SqliteException 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!",
throw new Exception( SqlEx);
"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(); 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>
/// ///
/// </summary> /// </summary>
@ -1964,6 +1990,7 @@ namespace OpenSim.Data.SQLite
sql += ") values (:"; sql += ") values (:";
sql += String.Join(", :", cols); sql += String.Join(", :", cols);
sql += ")"; sql += ")";
m_log.DebugFormat("[SQLITE]: Created insert command {0}", sql);
SqliteCommand cmd = new SqliteCommand(sql); SqliteCommand cmd = new SqliteCommand(sql);
// this provides the binding for all our parameters, so // this provides the binding for all our parameters, so
@ -2259,6 +2286,36 @@ namespace OpenSim.Data.SQLite
return DbType.String; return DbType.String;
} }
} }
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();
}
}
}
} }
} }

View File

@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using Mono.Data.SqliteClient; using Mono.Data.Sqlite;
namespace OpenSim.Data.SQLite namespace OpenSim.Data.SQLite
{ {
@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLite
if (words.Length == 1) 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]); m_Realm, scopeID.ToString(), words[0]);
} }
else else

View File

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

View File

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

View File

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

View File

@ -30,11 +30,11 @@ using System.Data;
using System.Reflection; using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
using log4net; using log4net;
using Mono.Data.Sqlite; using Mono.Data.SqliteClient;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Data.SQLiteNG namespace OpenSim.Data.SQLiteLegacy
{ {
/// <summary> /// <summary>
/// An asset storage interface for the SQLite database system /// An asset storage interface for the SQLite database system
@ -137,7 +137,7 @@ namespace OpenSim.Data.SQLiteNG
cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local)); cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary)); cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data)); cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
} }
@ -340,4 +340,4 @@ namespace OpenSim.Data.SQLiteNG
#endregion #endregion
} }
} }

View File

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

View File

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

View File

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

View File

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

View File

@ -31,9 +31,9 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; 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 public class SQLiteFriendsData : SQLiteGenericTableHandler<FriendsData>, IFriendsData
{ {
@ -47,7 +47,7 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = new SqliteCommand(); 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.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); return DoQuery(cmd);
@ -58,8 +58,8 @@ namespace OpenSim.Data.SQLiteNG
SqliteCommand cmd = new SqliteCommand(); SqliteCommand cmd = new SqliteCommand();
cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm); cmd.CommandText = String.Format("delete from {0} where PrincipalID = :PrincipalID and Friend = :Friend", m_Realm);
cmd.Parameters.AddWithValue(":PrincipalID", principalID.ToString()); cmd.Parameters.Add(":PrincipalID", principalID.ToString());
cmd.Parameters.AddWithValue(":Friend", friend); cmd.Parameters.Add(":Friend", friend);
ExecuteNonQuery(cmd, cmd.Connection); ExecuteNonQuery(cmd, cmd.Connection);

View File

@ -30,12 +30,12 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Mono.Data.Sqlite; using Mono.Data.SqliteClient;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Data.SQLiteNG namespace OpenSim.Data.SQLiteLegacy
{ {
public class SQLiteGenericTableHandler<T> : SQLiteFramework where T: class, new() public class SQLiteGenericTableHandler<T> : SQLiteFramework where T: class, new()
{ {
@ -59,21 +59,19 @@ namespace OpenSim.Data.SQLiteNG
if (!m_initialized) if (!m_initialized)
{ {
m_Connection = new SqliteConnection(connectionString); m_Connection = new SqliteConnection(connectionString);
Console.WriteLine(string.Format("OPENING CONNECTION FOR {0} USING {1}", storeName, connectionString));
m_Connection.Open(); m_Connection.Open();
if (storeName != String.Empty) if (storeName != String.Empty)
{ {
Assembly assem = GetType().Assembly; Assembly assem = GetType().Assembly;
//SqliteConnection newConnection = SqliteConnection newConnection =
// (SqliteConnection)((ICloneable)m_Connection).Clone(); (SqliteConnection)((ICloneable)m_Connection).Clone();
//newConnection.Open(); 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(); m.Update();
//newConnection.Close(); newConnection.Close();
//newConnection.Dispose(); newConnection.Dispose();
} }
m_initialized = true; m_initialized = true;
@ -199,7 +197,7 @@ namespace OpenSim.Data.SQLiteNG
result.Add(row); result.Add(row);
} }
//CloseCommand(cmd); CloseCommand(cmd);
return result.ToArray(); return result.ToArray();
} }

View File

@ -30,11 +30,11 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Mono.Data.Sqlite; using Mono.Data.SqliteClient;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Data.SQLiteNG namespace OpenSim.Data.SQLiteLegacy
{ {
/// <summary> /// <summary>
/// An Inventory Interface to the SQLite database /// An Inventory Interface to the SQLite database
@ -98,13 +98,11 @@ namespace OpenSim.Data.SQLiteNG
ds.Tables.Add(createInventoryFoldersTable()); ds.Tables.Add(createInventoryFoldersTable());
invFoldersDa.Fill(ds.Tables["inventoryfolders"]); invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
setupFoldersCommands(invFoldersDa, conn); setupFoldersCommands(invFoldersDa, conn);
CreateDataSetMapping(invFoldersDa, "inventoryfolders");
m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions"); m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
ds.Tables.Add(createInventoryItemsTable()); ds.Tables.Add(createInventoryItemsTable());
invItemsDa.Fill(ds.Tables["inventoryitems"]); invItemsDa.Fill(ds.Tables["inventoryitems"]);
setupItemsCommands(invItemsDa, conn); setupItemsCommands(invItemsDa, conn);
CreateDataSetMapping(invItemsDa, "inventoryitems");
m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions"); m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
ds.AcceptChanges(); 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> /// <summary>
/// Create the "inventoryitems" table /// Create the "inventoryitems" table
/// </summary> /// </summary>

View File

@ -32,13 +32,13 @@ using System.Drawing;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Mono.Data.Sqlite; using Mono.Data.SqliteClient;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.SQLiteNG namespace OpenSim.Data.SQLiteLegacy
{ {
/// <summary> /// <summary>
/// A RegionData Interface to the SQLite database /// A RegionData Interface to the SQLite database
@ -87,142 +87,119 @@ namespace OpenSim.Data.SQLiteNG
/// <param name="connectionString">the connection string</param> /// <param name="connectionString">the connection string</param>
public void Initialise(string connectionString) public void Initialise(string connectionString)
{ {
try m_connectionString = connectionString;
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);
// SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn);
itemsDa = new SqliteDataAdapter(itemsSelectCmd);
SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
terrainDa = new SqliteDataAdapter(terrainSelectCmd);
SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
landDa = new SqliteDataAdapter(landSelectCmd);
SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
// This actually does the roll forward assembly stuff
Assembly assem = GetType().Assembly;
Migration m = new Migration(m_conn, assem, "RegionStore");
m.Update();
lock (ds)
{ {
m_connectionString = connectionString; ds.Tables.Add(createPrimTable());
setupPrimCommands(primDa, m_conn);
primDa.Fill(ds.Tables["prims"]);
ds = new DataSet("Region"); ds.Tables.Add(createShapeTable());
setupShapeCommands(shapeDa, m_conn);
m_log.Info("[REGION DB]: Sqlite - connecting: " + connectionString); ds.Tables.Add(createItemsTable());
m_conn = new SqliteConnection(m_connectionString); setupItemsCommands(itemsDa, m_conn);
m_conn.Open(); itemsDa.Fill(ds.Tables["primitems"]);
SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn); ds.Tables.Add(createTerrainTable());
primDa = new SqliteDataAdapter(primSelectCmd); setupTerrainCommands(terrainDa, m_conn);
SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn); ds.Tables.Add(createLandTable());
shapeDa = new SqliteDataAdapter(shapeSelectCmd); setupLandCommands(landDa, m_conn);
// SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
SqliteCommand itemsSelectCmd = new SqliteCommand(itemsSelect, m_conn); ds.Tables.Add(createLandAccessListTable());
itemsDa = new SqliteDataAdapter(itemsSelectCmd); setupLandAccessCommands(landAccessListDa, m_conn);
SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn); ds.Tables.Add(createRegionSettingsTable());
terrainDa = new SqliteDataAdapter(terrainSelectCmd);
setupRegionSettingsCommands(regionSettingsDa, m_conn);
SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn); // WORKAROUND: This is a work around for sqlite on
landDa = new SqliteDataAdapter(landSelectCmd); // windows, which gets really unhappy with blob columns
// that have no sample data in them. At some point we
SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn); // need to actually find a proper way to handle this.
landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd); try
SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
// This actually does the roll forward assembly stuff
Assembly assem = GetType().Assembly;
Migration m = new Migration(m_conn, assem, "RegionStore");
m.Update();
lock (ds)
{ {
ds.Tables.Add(createPrimTable()); shapeDa.Fill(ds.Tables["primshapes"]);
setupPrimCommands(primDa, m_conn); }
catch (Exception)
ds.Tables.Add(createShapeTable()); {
setupShapeCommands(shapeDa, m_conn); m_log.Info("[REGION DB]: Caught fill error on primshapes table");
ds.Tables.Add(createItemsTable());
setupItemsCommands(itemsDa, m_conn);
ds.Tables.Add(createTerrainTable());
setupTerrainCommands(terrainDa, m_conn);
ds.Tables.Add(createLandTable());
setupLandCommands(landDa, m_conn);
ds.Tables.Add(createLandAccessListTable());
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"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on primshapes table");
}
try
{
terrainDa.Fill(ds.Tables["terrain"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on terrain table");
}
try
{
landDa.Fill(ds.Tables["land"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on land table");
}
try
{
landAccessListDa.Fill(ds.Tables["landaccesslist"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
}
try
{
regionSettingsDa.Fill(ds.Tables["regionsettings"]);
}
catch (Exception)
{
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; try
{
terrainDa.Fill(ds.Tables["terrain"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on terrain table");
}
try
{
landDa.Fill(ds.Tables["land"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on land table");
}
try
{
landAccessListDa.Fill(ds.Tables["landaccesslist"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on landaccesslist table");
}
try
{
regionSettingsDa.Fill(ds.Tables["regionsettings"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on regionsettings table");
}
return;
}
} }
public void Dispose() public void Dispose()
@ -626,7 +603,7 @@ namespace OpenSim.Data.SQLiteNG
} }
} }
} }
rev = Convert.ToInt32(row["Revision"]); rev = (int) row["Revision"];
} }
else else
{ {
@ -778,7 +755,6 @@ namespace OpenSim.Data.SQLiteNG
/// </summary> /// </summary>
public void Commit() public void Commit()
{ {
m_log.Debug("[SQLITE]: Starting commit");
lock (ds) lock (ds)
{ {
primDa.Update(ds, "prims"); primDa.Update(ds, "prims");
@ -793,11 +769,18 @@ namespace OpenSim.Data.SQLiteNG
{ {
regionSettingsDa.Update(ds, "regionsettings"); regionSettingsDa.Update(ds, "regionsettings");
} }
catch (SqliteException SqlEx) catch (SqliteExecutionException SqlEx)
{ {
throw new Exception( if (SqlEx.Message.Contains("logic error"))
"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); 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(); 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>
/// ///
/// </summary> /// </summary>
@ -1990,7 +1964,6 @@ namespace OpenSim.Data.SQLiteNG
sql += ") values (:"; sql += ") values (:";
sql += String.Join(", :", cols); sql += String.Join(", :", cols);
sql += ")"; sql += ")";
m_log.DebugFormat("[SQLITE]: Created insert command {0}", sql);
SqliteCommand cmd = new SqliteCommand(sql); SqliteCommand cmd = new SqliteCommand(sql);
// this provides the binding for all our parameters, so // this provides the binding for all our parameters, so
@ -2286,36 +2259,6 @@ namespace OpenSim.Data.SQLiteNG
return DbType.String; return DbType.String;
} }
} }
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();
}
}
}
} }
} }

View File

@ -31,9 +31,9 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; 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 public class SQLiteUserAccountData : SQLiteGenericTableHandler<UserAccountData>, IUserAccountData
{ {
@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLiteNG
if (words.Length == 1) 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]); m_Realm, scopeID.ToString(), words[0]);
} }
else else

View File

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

View File

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

View File

@ -39,7 +39,8 @@ namespace OpenSim.Data.Tests
public class DataTestUtil public class DataTestUtil
{ {
public const uint UNSIGNED_INTEGER_MIN = uint.MinValue; 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_MIN = int.MinValue + 1; // Postgresql requires +1 to .NET int.MinValue
public const int INTEGER_MAX = int.MaxValue; public const int INTEGER_MAX = int.MaxValue;

View File

@ -113,14 +113,14 @@
; --- To use sqlite as region storage: ; --- 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 ; 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 ; 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 sqlite3 system library or use MySQL instead ; 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 ; 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"; storage_connection_string="URI=file:OpenSim.db,version=3";
; --- To use MySQL storage, supply your own connection string (this is only an example): ; --- To use MySQL storage, supply your own connection string (this is only an example):

View File

@ -6,12 +6,12 @@
; ;
; SQLite ; 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 ; Unfortunately the current SQLite database plugin 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 ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite)
; for more details ; for more details
;Include-Storage = "config-include/storage/SQLiteStandalone.ini"; ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
; MySql ; MySql
; Uncomment these lines if you want to use mysql storage ; Uncomment these lines if you want to use mysql storage

View File

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

View File

@ -2178,7 +2178,7 @@
</Files> </Files>
</Project> </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"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../../../bin/</OutputPath> <OutputPath>../../../bin/</OutputPath>
@ -2215,7 +2215,7 @@
</Files> </Files>
</Project> </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"> <Configuration name="Debug">
<Options> <Options>
<OutputPath>../../../bin/</OutputPath> <OutputPath>../../../bin/</OutputPath>