lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 9219: update SQLite to System.Data.Sqlite 2.0.2 (native 3.50.4.5). Must run prebuild. This needs testing :(

Browse Source
This commit is contained in:
UbitUmarov
2025-11-10 17:35:22 +00:00
parent dc4513ac33
commit 9612ea2491
23 changed files with 348 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/SQLite/SQLiteAgentPreferencesData.cs
View File

@@ -31,11 +31,7 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{

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

@@ -30,11 +30,7 @@ using System.Data;
using System.Reflection;
using System.Collections.Generic;
using log4net;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
using OpenMetaverse;
using OpenSim.Framework;
@@ -55,7 +51,7 @@ namespace OpenSim.Data.SQLite
private const string UpdateAssetSQL = "update assets set Name=:Name, Description=:Description, Type=:Type, Local=:Local, Temporary=:Temporary, asset_flags=:Flags, CreatorID=:CreatorID, Data=:Data where UUID=:UUID";
private const string assetSelect = "select * from assets";
private SqliteConnection m_conn;
private SQLiteConnection m_conn;
protected virtual Assembly Assembly
{
@@ -81,13 +77,13 @@ namespace OpenSim.Data.SQLite
/// <param name="dbconnect">connect string</param>
override public void Initialise(string dbconnect)
{
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
if (dbconnect.Length == 0)
{
dbconnect = "URI=file:Asset.db,version=3";
dbconnect = "URI=file:Asset.db";
}
m_conn = new SqliteConnection(dbconnect);
m_conn = new SQLiteConnection(dbconnect);
m_conn.Open();
Migration m = new Migration(m_conn, Assembly, "AssetStore");
@@ -105,9 +101,9 @@ namespace OpenSim.Data.SQLite
{
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(SelectAssetSQL, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":UUID", uuid.ToString()));
using (IDataReader reader = cmd.ExecuteReader())
{
if (reader.Read())
@@ -157,17 +153,17 @@ namespace OpenSim.Data.SQLite
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(UpdateAssetSQL, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":Name", assetName));
cmd.Parameters.Add(new SqliteParameter(":Description", assetDescription));
cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
cmd.Parameters.Add(new SqliteParameter(":Flags", asset.Flags));
cmd.Parameters.Add(new SqliteParameter(":CreatorID", asset.Metadata.CreatorID));
cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
cmd.Parameters.Add(new SQLiteParameter(":UUID", asset.FullID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":Name", assetName));
cmd.Parameters.Add(new SQLiteParameter(":Description", assetDescription));
cmd.Parameters.Add(new SQLiteParameter(":Type", asset.Type));
cmd.Parameters.Add(new SQLiteParameter(":Local", asset.Local));
cmd.Parameters.Add(new SQLiteParameter(":Temporary", asset.Temporary));
cmd.Parameters.Add(new SQLiteParameter(":Flags", asset.Flags));
cmd.Parameters.Add(new SQLiteParameter(":CreatorID", asset.Metadata.CreatorID));
cmd.Parameters.Add(new SQLiteParameter(":Data", asset.Data));
cmd.ExecuteNonQuery();
return true;
@@ -178,17 +174,17 @@ namespace OpenSim.Data.SQLite
{
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(InsertAssetSQL, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":Name", assetName));
cmd.Parameters.Add(new SqliteParameter(":Description", assetDescription));
cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
cmd.Parameters.Add(new SqliteParameter(":Flags", asset.Flags));
cmd.Parameters.Add(new SqliteParameter(":CreatorID", asset.Metadata.CreatorID));
cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
cmd.Parameters.Add(new SQLiteParameter(":UUID", asset.FullID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":Name", assetName));
cmd.Parameters.Add(new SQLiteParameter(":Description", assetDescription));
cmd.Parameters.Add(new SQLiteParameter(":Type", asset.Type));
cmd.Parameters.Add(new SQLiteParameter(":Local", asset.Local));
cmd.Parameters.Add(new SQLiteParameter(":Temporary", asset.Temporary));
cmd.Parameters.Add(new SQLiteParameter(":Flags", asset.Flags));
cmd.Parameters.Add(new SQLiteParameter(":CreatorID", asset.Metadata.CreatorID));
cmd.Parameters.Add(new SQLiteParameter(":Data", asset.Data));
cmd.ExecuteNonQuery();
return true;
@@ -231,7 +227,7 @@ namespace OpenSim.Data.SQLite
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(sql, m_conn))
{
using (IDataReader reader = cmd.ExecuteReader())
{
@@ -307,10 +303,10 @@ namespace OpenSim.Data.SQLite
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(SelectAssetMetadataSQL, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(SelectAssetMetadataSQL, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":start", start));
cmd.Parameters.Add(new SqliteParameter(":count", count));
cmd.Parameters.Add(new SQLiteParameter(":start", start));
cmd.Parameters.Add(new SQLiteParameter(":count", count));
using (IDataReader reader = cmd.ExecuteReader())
{
@@ -359,7 +355,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
override public void Initialise()
{
Initialise("URI=file:Asset.db,version=3");
Initialise("URI=file:Asset.db");
}
/// <summary>
@@ -380,9 +376,9 @@ namespace OpenSim.Data.SQLite
{
lock (this)
{
using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(DeleteAssetSQL, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":UUID", uuid.ToString()));
cmd.ExecuteNonQuery();
}
}

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

@@ -34,11 +34,7 @@ using log4net;
using OpenMetaverse;
using OpenSim.Framework;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -50,7 +46,7 @@ namespace OpenSim.Data.SQLite
private List<string> m_ColumnNames;
private int m_LastExpire;
protected static SqliteConnection m_Connection;
protected static SQLiteConnection m_Connection;
private static bool m_initialized = false;
protected virtual Assembly Assembly
@@ -65,9 +61,9 @@ namespace OpenSim.Data.SQLite
if (!m_initialized)
{
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
m_Connection = new SqliteConnection(connectionString);
m_Connection = new SQLiteConnection(connectionString);
m_Connection.Open();
Migration m = new Migration(m_Connection, Assembly, "AuthStore");
@@ -83,9 +79,9 @@ namespace OpenSim.Data.SQLite
ret.Data = new Dictionary<string, object>();
IDataReader result;
using (SqliteCommand cmd = new SqliteCommand("select * from `" + m_Realm + "` where UUID = :PrincipalID"))
using (SQLiteCommand cmd = new SQLiteCommand("select * from `" + m_Realm + "` where UUID = :PrincipalID"))
{
cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":PrincipalID", principalID.ToString()));
result = ExecuteReader(cmd, m_Connection);
}
@@ -137,7 +133,7 @@ namespace OpenSim.Data.SQLite
foreach (object o in data.Data.Values)
values[i++] = o.ToString();
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
if (Get(data.PrincipalID) != null)
{
@@ -150,13 +146,13 @@ namespace OpenSim.Data.SQLite
if (!first)
update += ", ";
update += "`" + field + "` = :" + field;
cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
cmd.Parameters.Add(new SQLiteParameter(":" + field, data.Data[field]));
first = false;
}
update += " where UUID = :UUID";
cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":UUID", data.PrincipalID.ToString()));
cmd.CommandText = update;
try
@@ -180,9 +176,9 @@ namespace OpenSim.Data.SQLite
String.Join("`, `", fields) +
"`) values (:UUID, :" + String.Join(", :", fields) + ")";
cmd.Parameters.Add(new SqliteParameter(":UUID", data.PrincipalID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":UUID", data.PrincipalID.ToString()));
foreach (string field in fields)
cmd.Parameters.Add(new SqliteParameter(":" + field, data.Data[field]));
cmd.Parameters.Add(new SQLiteParameter(":" + field, data.Data[field]));
cmd.CommandText = insert;
@@ -206,7 +202,7 @@ namespace OpenSim.Data.SQLite
public bool SetDataItem(UUID principalID, string item, string value)
{
using (SqliteCommand cmd = new SqliteCommand("update `" + m_Realm +
using (SQLiteCommand cmd = new SQLiteCommand("update `" + m_Realm +
"` set `" + item + "` = " + value + " where UUID = '" + principalID.ToString() + "'"))
{
if (ExecuteNonQuery(cmd, m_Connection) > 0)
@@ -221,7 +217,7 @@ namespace OpenSim.Data.SQLite
if (System.Environment.TickCount - m_LastExpire > 30000)
DoExpire();
using (SqliteCommand cmd = new SqliteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() +
using (SQLiteCommand cmd = new SQLiteCommand("insert into tokens (UUID, token, validity) values ('" + principalID.ToString() +
"', '" + token + "', datetime('now', 'localtime', '+" + lifetime.ToString() + " minutes'))"))
{
if (ExecuteNonQuery(cmd, m_Connection) > 0)
@@ -236,7 +232,7 @@ namespace OpenSim.Data.SQLite
if (System.Environment.TickCount - m_LastExpire > 30000)
DoExpire();
using (SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() +
using (SQLiteCommand cmd = new SQLiteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() +
" minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')"))
{
if (ExecuteNonQuery(cmd, m_Connection) > 0)
@@ -248,7 +244,7 @@ namespace OpenSim.Data.SQLite
private void DoExpire()
{
using (SqliteCommand cmd = new SqliteCommand("delete from tokens where validity < datetime('now', 'localtime')"))
using (SQLiteCommand cmd = new SQLiteCommand("delete from tokens where validity < datetime('now', 'localtime')"))
ExecuteNonQuery(cmd, m_Connection);
m_LastExpire = System.Environment.TickCount;

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

@@ -33,11 +33,7 @@ using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -56,7 +52,7 @@ namespace OpenSim.Data.SQLite
public bool Delete(UUID principalID, string name)
{
using (SqliteCommand cmd = new SqliteCommand())
using (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());

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

@@ -30,11 +30,8 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
@@ -46,7 +43,7 @@ namespace OpenSim.Data.SQLite
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private SqliteConnection m_connection;
private SQLiteConnection m_connection;
private string m_connectionString;
private FieldInfo[] m_Fields;
@@ -69,13 +66,13 @@ namespace OpenSim.Data.SQLite
public void Initialise(string connectionString)
{
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
m_connectionString = connectionString;
m_log.Info("[ESTATE DB]: Sqlite - connecting: "+m_connectionString);
m_connection = new SqliteConnection(m_connectionString);
m_connection = new SQLiteConnection(m_connectionString);
m_connection.Open();
Migration m = new Migration(m_connection, Assembly, "EstateStore");
@@ -103,7 +100,7 @@ namespace OpenSim.Data.SQLite
{
string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = :RegionID";
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = sql;
cmd.Parameters.AddWithValue(":RegionID", regionID.ToString());
@@ -112,7 +109,7 @@ namespace OpenSim.Data.SQLite
}
}
private EstateSettings DoLoad(SqliteCommand cmd, UUID regionID, bool create)
private EstateSettings DoLoad(SQLiteCommand cmd, UUID regionID, bool create)
{
EstateSettings es = new EstateSettings();
es.OnSave += StoreEstateSettings;
@@ -121,7 +118,7 @@ namespace OpenSim.Data.SQLite
{
r = cmd.ExecuteReader();
}
catch (SqliteException)
catch (SQLiteException)
{
m_log.Error("[SQLITE]: There was an issue loading the estate settings. This can happen the first time running OpenSimulator with CSharpSqlite the first time. OpenSimulator will probably crash, restart it and it should be good to go.");
}
@@ -188,7 +185,7 @@ namespace OpenSim.Data.SQLite
{
List<string> names = new List<string>(FieldList);
using (SqliteCommand cmd = m_connection.CreateCommand())
using (SQLiteCommand cmd = m_connection.CreateCommand())
{
if (es.EstateID < 100)
{
@@ -238,7 +235,7 @@ namespace OpenSim.Data.SQLite
foreach (string f in fields)
terms.Add(f+" = :"+f);
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = "update estate_settings set " + String.Join(", ", terms.ToArray()) + " where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
@@ -273,7 +270,7 @@ namespace OpenSim.Data.SQLite
IDataReader r;
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = "select * from estateban where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", es.EstateID);
@@ -297,7 +294,7 @@ namespace OpenSim.Data.SQLite
private void SaveBanList(EstateSettings es)
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = "delete from estateban where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", es.EstateID.ToString());
@@ -323,7 +320,7 @@ namespace OpenSim.Data.SQLite
void SaveUUIDList(uint EstateID, string table, UUID[] data)
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = "delete from "+table+" where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", EstateID.ToString());
@@ -350,7 +347,7 @@ namespace OpenSim.Data.SQLite
List<UUID> uuids = new List<UUID>();
IDataReader r;
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = "select uuid from "+table+" where EstateID = :EstateID";
cmd.Parameters.AddWithValue(":EstateID", EstateID);
@@ -376,7 +373,7 @@ namespace OpenSim.Data.SQLite
{
string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_settings where estate_settings.EstateID = :EstateID";
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = sql;
cmd.Parameters.AddWithValue(":EstateID", estateID.ToString());
@@ -403,7 +400,7 @@ namespace OpenSim.Data.SQLite
string sql = "select EstateID from estate_settings where estate_settings.EstateName = :EstateName";
IDataReader r;
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = sql;
cmd.Parameters.AddWithValue(":EstateName", search);
@@ -427,7 +424,7 @@ namespace OpenSim.Data.SQLite
string sql = "select EstateID from estate_settings";
IDataReader r;
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = sql;
@@ -450,7 +447,7 @@ namespace OpenSim.Data.SQLite
string sql = "select EstateID from estate_settings where estate_settings.EstateOwner = :EstateOwner";
IDataReader r;
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = sql;
cmd.Parameters.AddWithValue(":EstateOwner", ownerID);
@@ -469,10 +466,10 @@ namespace OpenSim.Data.SQLite
public bool LinkRegion(UUID regionID, int estateID)
{
using(SqliteTransaction transaction = m_connection.BeginTransaction())
using(SQLiteTransaction transaction = m_connection.BeginTransaction())
{
// Delete any existing estate mapping for this region.
using(SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using(SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = "delete from estate_map where RegionID = :RegionID";
cmd.Transaction = transaction;
@@ -481,7 +478,7 @@ namespace OpenSim.Data.SQLite
cmd.ExecuteNonQuery();
}
using(SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using(SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = "insert into estate_map values (:RegionID, :EstateID)";
cmd.Transaction = transaction;

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

@@ -31,11 +31,7 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -48,7 +44,7 @@ namespace OpenSim.Data.SQLite
protected SQLiteFramework(string connectionString)
{
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
}
//////////////////////////////////////////////////////////////
@@ -56,7 +52,7 @@ namespace OpenSim.Data.SQLite
// All non queries are funneled through one connection
// to increase performance a little
//
protected int ExecuteNonQuery(SqliteCommand cmd, SqliteConnection connection)
protected int ExecuteNonQuery(SQLiteCommand cmd, SQLiteConnection connection)
{
lock (connection)
{
@@ -67,12 +63,12 @@ namespace OpenSim.Data.SQLite
}
}
protected IDataReader ExecuteReader(SqliteCommand cmd, SqliteConnection connection)
protected IDataReader ExecuteReader(SQLiteCommand cmd, SQLiteConnection connection)
{
lock (connection)
{
//SqliteConnection newConnection =
// (SqliteConnection)((ICloneable)connection).Clone();
//SQLiteConnection newConnection =
// (SQLiteConnection)((ICloneable)connection).Clone();
//newConnection.Open();
//cmd.Connection = newConnection;

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

@@ -31,11 +31,7 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -53,7 +49,7 @@ namespace OpenSim.Data.SQLite
public FriendsData[] GetFriends(string userID)
{
using (SqliteCommand cmd = new SqliteCommand())
using (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());
@@ -69,7 +65,7 @@ namespace OpenSim.Data.SQLite
public override bool Delete(string principalID, string friend)
{
using (SqliteCommand cmd = new SqliteCommand())
using (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());

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

@@ -30,11 +30,8 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
@@ -52,7 +49,7 @@ namespace OpenSim.Data.SQLite
protected string m_Realm;
protected FieldInfo m_DataField = null;
protected static SqliteConnection m_Connection;
protected static SQLiteConnection m_Connection;
private static bool m_initialized;
protected virtual Assembly Assembly
@@ -67,14 +64,14 @@ namespace OpenSim.Data.SQLite
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();
if (storeName != String.Empty)
{
//SqliteConnection newConnection =
// (SqliteConnection)((ICloneable)m_Connection).Clone();
//SQLiteConnection newConnection =
// (SQLiteConnection)((ICloneable)m_Connection).Clone();
//newConnection.Open();
//Migration m = new Migration(newConnection, Assembly, storeName);
@@ -132,11 +129,11 @@ namespace OpenSim.Data.SQLite
List<string> terms = new List<string>();
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
for (int i = 0 ; i < fields.Length ; i++)
{
cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
cmd.Parameters.Add(new SQLiteParameter(":" + fields[i], keys[i]));
terms.Add("`" + fields[i] + "` = :" + fields[i]);
}
@@ -151,7 +148,7 @@ namespace OpenSim.Data.SQLite
}
}
protected T[] DoQuery(SqliteCommand cmd)
protected T[] DoQuery(SQLiteCommand cmd)
{
IDataReader reader = ExecuteReader(cmd, m_Connection);
if (reader == null)
@@ -215,7 +212,7 @@ namespace OpenSim.Data.SQLite
public virtual T[] Get(string where)
{
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
string query = String.Format("select * from {0} where {1}",
m_Realm, where);
@@ -228,7 +225,7 @@ namespace OpenSim.Data.SQLite
public virtual bool Store(T row)
{
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
string query = "";
List<String> names = new List<String>();
@@ -238,7 +235,7 @@ namespace OpenSim.Data.SQLite
{
names.Add(fi.Name);
values.Add(":" + fi.Name);
cmd.Parameters.Add(new SqliteParameter(":" + fi.Name, fi.GetValue(row).ToString()));
cmd.Parameters.Add(new SQLiteParameter(":" + fi.Name, fi.GetValue(row).ToString()));
}
if (m_DataField != null)
@@ -250,7 +247,7 @@ namespace OpenSim.Data.SQLite
{
names.Add(kvp.Key);
values.Add(":" + kvp.Key);
cmd.Parameters.Add(new SqliteParameter(":" + kvp.Key, kvp.Value));
cmd.Parameters.Add(new SQLiteParameter(":" + kvp.Key, kvp.Value));
}
}
@@ -277,11 +274,11 @@ namespace OpenSim.Data.SQLite
List<string> terms = new List<string>();
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
for (int i = 0 ; i < fields.Length ; i++)
{
cmd.Parameters.Add(new SqliteParameter(":" + fields[i], keys[i]));
cmd.Parameters.Add(new SQLiteParameter(":" + fields[i], keys[i]));
terms.Add("`" + fields[i] + "` = :" + fields[i]);
}

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

@@ -33,7 +33,7 @@ using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using Mono.Data.Sqlite;
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -69,7 +69,7 @@ namespace OpenSim.Data.SQLite
public void DeleteOld()
{
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
cmd.CommandText = String.Format("delete from {0} where TMStamp < datetime('now', '-2 day') ", m_Realm);

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

@@ -31,11 +31,7 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -54,7 +50,7 @@ namespace OpenSim.Data.SQLite
public bool Delete(UUID agentID, UUID muteID, string muteName)
{
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
cmd.CommandText = "delete from MuteList where `AgentID` = :AgentID and `MuteID` = :MuteID and `MuteName` = :MuteName";

207
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@@ -32,11 +32,8 @@ using System.Drawing;
using System.IO;
using System.Reflection;
using log4net;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
@@ -66,18 +63,18 @@ namespace OpenSim.Data.SQLite
private const string regionSpawnPointsSelect = "select * from spawn_points";
private DataSet ds;
private SqliteDataAdapter primDa;
private SqliteDataAdapter shapeDa;
private SqliteDataAdapter itemsDa;
private SqliteDataAdapter terrainDa;
private SqliteDataAdapter landDa;
private SqliteDataAdapter landAccessListDa;
private SqliteDataAdapter regionSettingsDa;
private SqliteDataAdapter regionWindlightDa;
private SqliteDataAdapter regionEnvironmentDa;
private SqliteDataAdapter regionSpawnPointsDa;
private SQLiteDataAdapter primDa;
private SQLiteDataAdapter shapeDa;
private SQLiteDataAdapter itemsDa;
private SQLiteDataAdapter terrainDa;
private SQLiteDataAdapter landDa;
private SQLiteDataAdapter landAccessListDa;
private SQLiteDataAdapter regionSettingsDa;
private SQLiteDataAdapter regionWindlightDa;
private SQLiteDataAdapter regionEnvironmentDa;
private SQLiteDataAdapter regionSpawnPointsDa;
private SqliteConnection m_conn;
private SQLiteConnection m_conn;
private String m_connectionString;
protected virtual Assembly Assembly
@@ -113,46 +110,46 @@ namespace OpenSim.Data.SQLite
{
try
{
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
m_connectionString = connectionString;
ds = new DataSet("Region");
m_log.Info("[SQLITE REGION DB]: Sqlite - connecting: " + connectionString);
m_conn = new SqliteConnection(m_connectionString);
m_conn = new SQLiteConnection(m_connectionString);
m_conn.Open();
SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
primDa = new SqliteDataAdapter(primSelectCmd);
SQLiteCommand primSelectCmd = new SQLiteCommand(primSelect, m_conn);
primDa = new SQLiteDataAdapter(primSelectCmd);
SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
shapeDa = new SqliteDataAdapter(shapeSelectCmd);
// SqliteCommandBuilder shapeCb = new SqliteCommandBuilder(shapeDa);
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 itemsSelectCmd = new SQLiteCommand(itemsSelect, m_conn);
itemsDa = new SQLiteDataAdapter(itemsSelectCmd);
SqliteCommand terrainSelectCmd = new SqliteCommand(terrainSelect, m_conn);
terrainDa = new SqliteDataAdapter(terrainSelectCmd);
SQLiteCommand terrainSelectCmd = new SQLiteCommand(terrainSelect, m_conn);
terrainDa = new SQLiteDataAdapter(terrainSelectCmd);
SqliteCommand landSelectCmd = new SqliteCommand(landSelect, m_conn);
landDa = new SqliteDataAdapter(landSelectCmd);
SQLiteCommand landSelectCmd = new SQLiteCommand(landSelect, m_conn);
landDa = new SQLiteDataAdapter(landSelectCmd);
SqliteCommand landAccessListSelectCmd = new SqliteCommand(landAccessListSelect, m_conn);
landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
SQLiteCommand landAccessListSelectCmd = new SQLiteCommand(landAccessListSelect, m_conn);
landAccessListDa = new SQLiteDataAdapter(landAccessListSelectCmd);
SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
SQLiteCommand regionSettingsSelectCmd = new SQLiteCommand(regionSettingsSelect, m_conn);
regionSettingsDa = new SQLiteDataAdapter(regionSettingsSelectCmd);
SqliteCommand regionWindlightSelectCmd = new SqliteCommand(regionWindlightSelect, m_conn);
regionWindlightDa = new SqliteDataAdapter(regionWindlightSelectCmd);
SQLiteCommand regionWindlightSelectCmd = new SQLiteCommand(regionWindlightSelect, m_conn);
regionWindlightDa = new SQLiteDataAdapter(regionWindlightSelectCmd);
SqliteCommand regionEnvironmentSelectCmd = new SqliteCommand(regionEnvironmentSelect, m_conn);
regionEnvironmentDa = new SqliteDataAdapter(regionEnvironmentSelectCmd);
SQLiteCommand regionEnvironmentSelectCmd = new SQLiteCommand(regionEnvironmentSelect, m_conn);
regionEnvironmentDa = new SQLiteDataAdapter(regionEnvironmentSelectCmd);
SqliteCommand regionSpawnPointsSelectCmd = new SqliteCommand(regionSpawnPointsSelect, m_conn);
regionSpawnPointsDa = new SqliteDataAdapter(regionSpawnPointsSelectCmd);
SQLiteCommand regionSpawnPointsSelectCmd = new SQLiteCommand(regionSpawnPointsSelect, m_conn);
regionSpawnPointsDa = new SQLiteDataAdapter(regionSpawnPointsSelectCmd);
// This actually does the roll forward assembly stuff
Migration m = new Migration(m_conn, Assembly, "RegionStore");
@@ -404,25 +401,25 @@ namespace OpenSim.Data.SQLite
// remove region's spawnpoints
using (
SqliteCommand cmd =
new SqliteCommand("delete from spawn_points where RegionID=:RegionID",
SQLiteCommand cmd =
new SQLiteCommand("delete from spawn_points where RegionID=:RegionID",
m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionID", rs.RegionUUID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":RegionID", rs.RegionUUID.ToString()));
cmd.ExecuteNonQuery();
}
}
foreach (SpawnPoint sp in rs.SpawnPoints())
{
using (SqliteCommand cmd = new SqliteCommand("insert into spawn_points(RegionID, Yaw, Pitch, Distance)" +
using (SQLiteCommand cmd = new SQLiteCommand("insert into spawn_points(RegionID, Yaw, Pitch, Distance)" +
"values ( :RegionID, :Yaw, :Pitch, :Distance)", m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionID", rs.RegionUUID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":Yaw", sp.Yaw));
cmd.Parameters.Add(new SqliteParameter(":Pitch", sp.Pitch));
cmd.Parameters.Add(new SqliteParameter(":Distance", sp.Distance));
cmd.Parameters.Add(new SQLiteParameter(":RegionID", rs.RegionUUID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":Yaw", sp.Yaw));
cmd.Parameters.Add(new SQLiteParameter(":Pitch", sp.Pitch));
cmd.Parameters.Add(new SQLiteParameter(":Distance", sp.Distance));
cmd.ExecuteNonQuery();
}
}
@@ -765,9 +762,9 @@ namespace OpenSim.Data.SQLite
{
lock (ds)
{
using (SqliteCommand cmd = new SqliteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn))
using (SQLiteCommand cmd = new SQLiteCommand("delete from terrain where RegionUUID=:RegionUUID", m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":RegionUUID", regionID.ToString()));
cmd.ExecuteNonQuery();
}
@@ -782,11 +779,11 @@ namespace OpenSim.Data.SQLite
m_log.DebugFormat("{0} Storing terrain format {1}", LogHeader, terrainDBRevision);
using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(sql, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":Revision", terrainDBRevision));
cmd.Parameters.Add(new SqliteParameter(":Heightfield", terrainDBblob));
cmd.Parameters.Add(new SQLiteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":Revision", terrainDBRevision));
cmd.Parameters.Add(new SQLiteParameter(":Heightfield", terrainDBblob));
cmd.ExecuteNonQuery();
}
}
@@ -802,9 +799,9 @@ namespace OpenSim.Data.SQLite
lock (ds)
{
using (
SqliteCommand cmd = new SqliteCommand("delete from bakedterrain where RegionUUID=:RegionUUID", m_conn))
SQLiteCommand cmd = new SQLiteCommand("delete from bakedterrain where RegionUUID=:RegionUUID", m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":RegionUUID", regionID.ToString()));
cmd.ExecuteNonQuery();
}
@@ -819,11 +816,11 @@ namespace OpenSim.Data.SQLite
m_log.DebugFormat("{0} Storing bakedterrain format {1}", LogHeader, terrainDBRevision);
using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(sql, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":Revision", terrainDBRevision));
cmd.Parameters.Add(new SqliteParameter(":Heightfield", terrainDBblob));
cmd.Parameters.Add(new SQLiteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":Revision", terrainDBRevision));
cmd.Parameters.Add(new SQLiteParameter(":Heightfield", terrainDBblob));
cmd.ExecuteNonQuery();
}
}
@@ -853,9 +850,9 @@ namespace OpenSim.Data.SQLite
String sql = "select RegionUUID, Revision, Heightfield from terrain" +
" where RegionUUID=:RegionUUID order by Revision desc";
using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(sql, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":RegionUUID", regionID.ToString()));
using (IDataReader row = cmd.ExecuteReader())
{
@@ -888,9 +885,9 @@ namespace OpenSim.Data.SQLite
String sql = "select RegionUUID, Revision, Heightfield from bakedterrain" +
" where RegionUUID=:RegionUUID";
using (SqliteCommand cmd = new SqliteCommand(sql, m_conn))
using (SQLiteCommand cmd = new SQLiteCommand(sql, m_conn))
{
cmd.Parameters.Add(new SqliteParameter(":RegionUUID", regionID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":RegionUUID", regionID.ToString()));
using (IDataReader row = cmd.ExecuteReader())
{
@@ -914,15 +911,15 @@ namespace OpenSim.Data.SQLite
// Can't use blanket SQL statements when using SqlAdapters unless you re-read the data into the adapter
// after you're done.
// replaced below code with the SqliteAdapter version.
//using (SqliteCommand cmd = new SqliteCommand("delete from land where UUID=:UUID", m_conn))
//using (SQLiteCommand cmd = new SQLiteCommand("delete from land where UUID=:UUID", m_conn))
//{
// cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString()));
// cmd.Parameters.Add(new SQLiteParameter(":UUID", globalID.ToString()));
// cmd.ExecuteNonQuery();
//}
//using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:UUID", m_conn))
//using (SQLiteCommand cmd = new SQLiteCommand("delete from landaccesslist where LandUUID=:UUID", m_conn))
//{
// cmd.Parameters.Add(new SqliteParameter(":UUID", globalID.ToString()));
// cmd.Parameters.Add(new SQLiteParameter(":UUID", globalID.ToString()));
// cmd.ExecuteNonQuery();
//}
@@ -971,9 +968,9 @@ namespace OpenSim.Data.SQLite
}
// I know this caused someone issues before, but OpenSim is unusable if we leave this stuff around
//using (SqliteCommand cmd = new SqliteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
//using (SQLiteCommand cmd = new SQLiteCommand("delete from landaccesslist where LandUUID=:LandUUID", m_conn))
//{
// cmd.Parameters.Add(new SqliteParameter(":LandUUID", parcel.LandData.GlobalID.ToString()));
// cmd.Parameters.Add(new SQLiteParameter(":LandUUID", parcel.LandData.GlobalID.ToString()));
// cmd.ExecuteNonQuery();
// }
@@ -1051,7 +1048,7 @@ namespace OpenSim.Data.SQLite
regionSettingsDa.Update(ds, "regionsettings");
regionWindlightDa.Update(ds, "regionwindlight");
}
catch (SqliteException SqlEx)
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!",
@@ -2588,7 +2585,7 @@ namespace OpenSim.Data.SQLite
/// front. If we just have a list of b, c, etc... we can
/// generate these strings instead of typing them out.
/// </remarks>
private static SqliteCommand createInsertCommand(string table, DataTable dt)
private static SQLiteCommand createInsertCommand(string table, DataTable dt)
{
string[] cols = new string[dt.Columns.Count];
for (int i = 0; i < dt.Columns.Count; i++)
@@ -2604,13 +2601,13 @@ namespace OpenSim.Data.SQLite
sql += String.Join(", :", cols);
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
// much less code than it used to be
foreach (DataColumn col in dt.Columns)
{
cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
cmd.Parameters.Add(createSQLiteParameter(col.ColumnName, col.DataType));
}
return cmd;
}
@@ -2623,7 +2620,7 @@ namespace OpenSim.Data.SQLite
/// <param name="pk"></param>
/// <param name="dt"></param>
/// <returns>the created command</returns>
private static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
private static SQLiteCommand createUpdateCommand(string table, string pk, DataTable dt)
{
string sql = "update " + table + " set ";
string subsql = String.Empty;
@@ -2638,14 +2635,14 @@ namespace OpenSim.Data.SQLite
}
sql += subsql;
sql += " where " + pk;
SqliteCommand cmd = new SqliteCommand(sql);
SQLiteCommand cmd = new SQLiteCommand(sql);
// this provides the binding for all our parameters, so
// much less code than it used to be
foreach (DataColumn col in dt.Columns)
{
cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
cmd.Parameters.Add(createSQLiteParameter(col.ColumnName, col.DataType));
}
return cmd;
}
@@ -2657,7 +2654,7 @@ namespace OpenSim.Data.SQLite
/// <param name="pk"></param>
/// <param name="dt"></param>
/// <returns>the created command</returns>
private static SqliteCommand createUpdateCommand(string table, string pk1, string pk2, DataTable dt)
private static SQLiteCommand createUpdateCommand(string table, string pk1, string pk2, DataTable dt)
{
string sql = "update " + table + " set ";
string subsql = String.Empty;
@@ -2672,14 +2669,14 @@ namespace OpenSim.Data.SQLite
}
sql += subsql;
sql += " where " + pk1 + " and " + pk2;
SqliteCommand cmd = new SqliteCommand(sql);
SQLiteCommand cmd = new SQLiteCommand(sql);
// this provides the binding for all our parameters, so
// much less code than it used to be
foreach (DataColumn col in dt.Columns)
{
cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
cmd.Parameters.Add(createSQLiteParameter(col.ColumnName, col.DataType));
}
return cmd;
}
@@ -2722,7 +2719,7 @@ namespace OpenSim.Data.SQLite
///<summary>
/// This is a convenience function that collapses 5 repetitive
/// lines for defining SqliteParameters to 2 parameters:
/// lines for defining SQLiteParameters to 2 parameters:
/// column name and database type.
///
/// It assumes certain conventions like :param as the param
@@ -2731,9 +2728,9 @@ namespace OpenSim.Data.SQLite
/// for us.
///</summary>
///<returns>a built sqlite parameter</returns>
private static SqliteParameter createSqliteParameter(string name, Type type)
private static SQLiteParameter createSQLiteParameter(string name, Type type)
{
SqliteParameter param = new SqliteParameter();
SQLiteParameter param = new SQLiteParameter();
param.ParameterName = ":" + name;
param.DbType = dbtypeFromType(type);
param.SourceColumn = name;
@@ -2746,7 +2743,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="da"></param>
/// <param name="conn"></param>
private void setupPrimCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupPrimCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("prims", ds.Tables["prims"]);
da.InsertCommand.Connection = conn;
@@ -2754,8 +2751,8 @@ namespace OpenSim.Data.SQLite
da.UpdateCommand = createUpdateCommand("prims", "UUID=:UUID", ds.Tables["prims"]);
da.UpdateCommand.Connection = conn;
SqliteCommand delete = new SqliteCommand("delete from prims where UUID = :UUID");
delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
SQLiteCommand delete = new SQLiteCommand("delete from prims where UUID = :UUID");
delete.Parameters.Add(createSQLiteParameter("UUID", typeof(String)));
delete.Connection = conn;
da.DeleteCommand = delete;
}
@@ -2765,7 +2762,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="da"></param>
/// <param name="conn"></param>
private void setupItemsCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupItemsCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("primitems", ds.Tables["primitems"]);
da.InsertCommand.Connection = conn;
@@ -2773,8 +2770,8 @@ namespace OpenSim.Data.SQLite
da.UpdateCommand = createUpdateCommand("primitems", "itemID = :itemID", ds.Tables["primitems"]);
da.UpdateCommand.Connection = conn;
SqliteCommand delete = new SqliteCommand("delete from primitems where itemID = :itemID");
delete.Parameters.Add(createSqliteParameter("itemID", typeof(String)));
SQLiteCommand delete = new SQLiteCommand("delete from primitems where itemID = :itemID");
delete.Parameters.Add(createSQLiteParameter("itemID", typeof(String)));
delete.Connection = conn;
da.DeleteCommand = delete;
}
@@ -2784,7 +2781,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="da"></param>
/// <param name="conn"></param>
private void setupTerrainCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupTerrainCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("terrain", ds.Tables["terrain"]);
da.InsertCommand.Connection = conn;
@@ -2795,7 +2792,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="da"></param>
/// <param name="conn"></param>
private void setupLandCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupLandCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("land", ds.Tables["land"]);
da.InsertCommand.Connection = conn;
@@ -2803,8 +2800,8 @@ namespace OpenSim.Data.SQLite
da.UpdateCommand = createUpdateCommand("land", "UUID=:UUID", ds.Tables["land"]);
da.UpdateCommand.Connection = conn;
SqliteCommand delete = new SqliteCommand("delete from land where UUID=:UUID");
delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
SQLiteCommand delete = new SQLiteCommand("delete from land where UUID=:UUID");
delete.Parameters.Add(createSQLiteParameter("UUID", typeof(String)));
da.DeleteCommand = delete;
da.DeleteCommand.Connection = conn;
}
@@ -2814,7 +2811,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="da"></param>
/// <param name="conn"></param>
private void setupLandAccessCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupLandAccessCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("landaccesslist", ds.Tables["landaccesslist"]);
da.InsertCommand.Connection = conn;
@@ -2822,14 +2819,14 @@ namespace OpenSim.Data.SQLite
da.UpdateCommand = createUpdateCommand("landaccesslist", "LandUUID=:landUUID", "AccessUUID=:AccessUUID", ds.Tables["landaccesslist"]);
da.UpdateCommand.Connection = conn;
SqliteCommand delete = new SqliteCommand("delete from landaccesslist where LandUUID= :LandUUID and AccessUUID= :AccessUUID");
delete.Parameters.Add(createSqliteParameter("LandUUID", typeof(String)));
delete.Parameters.Add(createSqliteParameter("AccessUUID", typeof(String)));
SQLiteCommand delete = new SQLiteCommand("delete from landaccesslist where LandUUID= :LandUUID and AccessUUID= :AccessUUID");
delete.Parameters.Add(createSQLiteParameter("LandUUID", typeof(String)));
delete.Parameters.Add(createSQLiteParameter("AccessUUID", typeof(String)));
da.DeleteCommand = delete;
da.DeleteCommand.Connection = conn;
}
private void setupRegionSettingsCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupRegionSettingsCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("regionsettings", ds.Tables["regionsettings"]);
da.InsertCommand.Connection = conn;
@@ -2842,7 +2839,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="da"></param>
/// <param name="conn"></param>
private void setupRegionWindlightCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupRegionWindlightCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("regionwindlight", ds.Tables["regionwindlight"]);
da.InsertCommand.Connection = conn;
@@ -2850,20 +2847,20 @@ namespace OpenSim.Data.SQLite
da.UpdateCommand.Connection = conn;
}
private void setupRegionEnvironmentCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupRegionEnvironmentCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("regionenvironment", ds.Tables["regionenvironment"]);
da.InsertCommand.Connection = conn;
da.UpdateCommand = createUpdateCommand("regionenvironment", "region_id=:region_id", ds.Tables["regionenvironment"]);
da.UpdateCommand.Connection = conn;
SqliteCommand delete = new SqliteCommand("delete from regionenvironment where region_id= :region_id");
delete.Parameters.Add(createSqliteParameter("region_id", typeof(String)));
SQLiteCommand delete = new SQLiteCommand("delete from regionenvironment where region_id= :region_id");
delete.Parameters.Add(createSQLiteParameter("region_id", typeof(String)));
da.DeleteCommand = delete;
da.DeleteCommand.Connection = conn;
}
private void setupRegionSpawnPointsCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupRegionSpawnPointsCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("spawn_points", ds.Tables["spawn_points"]);
da.InsertCommand.Connection = conn;
@@ -2876,7 +2873,7 @@ namespace OpenSim.Data.SQLite
/// </summary>
/// <param name="da"></param>
/// <param name="conn"></param>
private void setupShapeCommands(SqliteDataAdapter da, SqliteConnection conn)
private void setupShapeCommands(SQLiteDataAdapter da, SQLiteConnection conn)
{
da.InsertCommand = createInsertCommand("primshapes", ds.Tables["primshapes"]);
da.InsertCommand.Connection = conn;
@@ -2884,8 +2881,8 @@ namespace OpenSim.Data.SQLite
da.UpdateCommand = createUpdateCommand("primshapes", "UUID=:UUID", ds.Tables["primshapes"]);
da.UpdateCommand.Connection = conn;
SqliteCommand delete = new SqliteCommand("delete from primshapes where UUID = :UUID");
delete.Parameters.Add(createSqliteParameter("UUID", typeof(String)));
SQLiteCommand delete = new SQLiteCommand("delete from primshapes where UUID = :UUID");
delete.Parameters.Add(createSQLiteParameter("UUID", typeof(String)));
delete.Connection = conn;
da.DeleteCommand = delete;
}

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

@@ -31,11 +31,7 @@ using System.Collections.Generic;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -66,7 +62,7 @@ namespace OpenSim.Data.SQLite
if (words.Length > 2)
return new UserAccountData[0];
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
if (words.Length == 1)
{

59
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
View File

@@ -30,11 +30,8 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using log4net;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
@@ -47,7 +44,7 @@ namespace OpenSim.Data.SQLite
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private SqliteConnection m_connection;
private SQLiteConnection m_connection;
private string m_connectionString;
private Dictionary<string, FieldInfo> m_FieldMap =
@@ -69,13 +66,13 @@ namespace OpenSim.Data.SQLite
public void Initialise(string connectionString)
{
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
m_connectionString = connectionString;
m_log.Info("[PROFILES_DATA]: Sqlite - connecting: "+m_connectionString);
m_connection = new SqliteConnection(m_connectionString);
m_connection = new SQLiteConnection(m_connectionString);
m_connection.Open();
Migration m = new Migration(m_connection, Assembly, "UserProfiles");
@@ -94,7 +91,7 @@ namespace OpenSim.Data.SQLite
string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = :Id";
IDataReader reader = null;
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":Id", creatorId);
@@ -190,7 +187,7 @@ namespace OpenSim.Data.SQLite
ad.ExpirationDate = (int)epochexp.TotalSeconds;
try {
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":ClassifiedId", ad.ClassifiedId.ToString());
@@ -230,7 +227,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":ClassifiedId", recordId.ToString());
@@ -257,7 +254,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":AdId", ad.ClassifiedId.ToString());
@@ -303,7 +300,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
@@ -340,7 +337,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":CreatorId", avatarId.ToString());
@@ -416,7 +413,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
int top_pick;
int.TryParse(pick.TopPick.ToString(), out top_pick);
@@ -459,7 +456,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":PickId", pickId.ToString());
@@ -487,7 +484,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":Id", notes.UserId.ToString());
@@ -533,7 +530,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
@@ -562,7 +559,7 @@ namespace OpenSim.Data.SQLite
query += "SELECT * FROM userprofile WHERE ";
query += "useruuid = :Id";
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
@@ -639,7 +636,7 @@ namespace OpenSim.Data.SQLite
query += ":profileFirstImage, ";
query += ":profileFirstText)";
using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand put = (SQLiteCommand)m_connection.CreateCommand())
{
put.CommandText = query;
put.Parameters.AddWithValue(":userId", props.UserId.ToString());
@@ -678,7 +675,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":profileURL", props.WebUrl);
@@ -715,7 +712,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":WantMask", up.WantToMask);
@@ -751,7 +748,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
@@ -785,7 +782,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
@@ -803,7 +800,7 @@ namespace OpenSim.Data.SQLite
query = "INSERT INTO usersettings VALUES ";
query += "(:Id,'false','false', :Email)";
using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand put = (SQLiteCommand)m_connection.CreateCommand())
{
put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
put.Parameters.AddWithValue(":Email", pref.EMail);
@@ -835,7 +832,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
@@ -856,7 +853,7 @@ namespace OpenSim.Data.SQLite
query += ":DataKey,";
query += ":DataVal) ";
using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand put = (SQLiteCommand)m_connection.CreateCommand())
{
put.Parameters.AddWithValue(":Id", props.UserId.ToString());
put.Parameters.AddWithValue(":TagId", props.TagId.ToString());
@@ -891,7 +888,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":UserId", props.UserId.ToString());
@@ -921,7 +918,7 @@ namespace OpenSim.Data.SQLite
try
{
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = string.Format(query, "\"classifieds\"");
cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
@@ -935,7 +932,7 @@ namespace OpenSim.Data.SQLite
}
}
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = string.Format(query, "\"userpicks\"");
cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
@@ -951,7 +948,7 @@ namespace OpenSim.Data.SQLite
query = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = :Id";
using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
using (SQLiteCommand cmd = (SQLiteCommand)m_connection.CreateCommand())
{
cmd.CommandText = query;
cmd.Parameters.AddWithValue(":Id", avatarId.ToString());

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

@@ -27,11 +27,7 @@
using System;
using System.Data;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
namespace OpenSim.Data.SQLite
{
@@ -85,7 +81,7 @@ namespace OpenSim.Data.SQLite
/// front. If we just have a list of b, c, etc... we can
/// generate these strings instead of typing them out.
/// </remarks>
public static SqliteCommand createInsertCommand(string table, DataTable dt)
public static SQLiteCommand createInsertCommand(string table, DataTable dt)
{
string[] cols = new string[dt.Columns.Count];
@@ -101,13 +97,13 @@ namespace OpenSim.Data.SQLite
sql += ") values (:";
sql += String.Join(", :", cols);
sql += ")";
SqliteCommand cmd = new SqliteCommand(sql);
SQLiteCommand cmd = new SQLiteCommand(sql);
// this provides the binding for all our parameters, so
// much less code than it used to be
foreach (DataColumn col in dt.Columns)
{
cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
cmd.Parameters.Add(createSQLiteParameter(col.ColumnName, col.DataType));
}
return cmd;
}
@@ -119,7 +115,7 @@ namespace OpenSim.Data.SQLite
/// <param name="pk"></param>
/// <param name="dt"></param>
/// <returns>the created command</returns>
public static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt)
public static SQLiteCommand createUpdateCommand(string table, string pk, DataTable dt)
{
string sql = "update " + table + " set ";
string subsql = String.Empty;
@@ -134,14 +130,14 @@ namespace OpenSim.Data.SQLite
}
sql += subsql;
sql += " where " + pk;
SqliteCommand cmd = new SqliteCommand(sql);
SQLiteCommand cmd = new SQLiteCommand(sql);
// this provides the binding for all our parameters, so
// much less code than it used to be
foreach (DataColumn col in dt.Columns)
{
cmd.Parameters.Add(createSqliteParameter(col.ColumnName, col.DataType));
cmd.Parameters.Add(createSQLiteParameter(col.ColumnName, col.DataType));
}
return cmd;
}
@@ -188,7 +184,7 @@ namespace OpenSim.Data.SQLite
///<summary>
/// <para>
/// This is a convenience function that collapses 5 repetitive
/// lines for defining SqliteParameters to 2 parameters:
/// lines for defining SQLiteParameters to 2 parameters:
/// column name and database type.
/// </para>
///
@@ -202,9 +198,9 @@ namespace OpenSim.Data.SQLite
/// <param name="name"></param>
/// <param name="type"></param>
///<returns>a built sqlite parameter</returns>
public static SqliteParameter createSqliteParameter(string name, Type type)
public static SQLiteParameter createSQLiteParameter(string name, Type type)
{
SqliteParameter param = new SqliteParameter();
SQLiteParameter param = new SQLiteParameter();
param.ParameterName = ":" + name;
param.DbType = dbtypeFromType(type);
param.SourceColumn = name;

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

@@ -29,11 +29,7 @@ using System;
using System.Data;
using System.Reflection;
using System.Collections.Generic;
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
using System.Data.SQLite;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
@@ -52,7 +48,7 @@ namespace OpenSim.Data.SQLite
public SQLiteXInventoryData(string conn, string realm)
{
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
m_Folders = new SqliteFolderHandler(
conn, "inventoryfolders", "XInventoryStore");
@@ -193,11 +189,11 @@ namespace OpenSim.Data.SQLite
UUID oldParent = retrievedItems[0].parentFolderID;
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where inventoryID = :InventoryID", m_Realm);
cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParent));
cmd.Parameters.Add(new SqliteParameter(":InventoryID", id));
cmd.Parameters.Add(new SQLiteParameter(":ParentFolderID", newParent));
cmd.Parameters.Add(new SQLiteParameter(":InventoryID", id));
if (ExecuteNonQuery(cmd, m_Connection) == 0)
return false;
@@ -211,12 +207,12 @@ namespace OpenSim.Data.SQLite
public XInventoryItem[] GetActiveGestures(UUID principalID)
{
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
cmd.CommandText = String.Format("select * from inventoryitems where avatarId = :uuid and assetType = :type and flags = 1", m_Realm);
cmd.Parameters.Add(new SqliteParameter(":uuid", principalID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":type", (int)AssetType.Gesture));
cmd.Parameters.Add(new SQLiteParameter(":uuid", principalID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":type", (int)AssetType.Gesture));
return DoQuery(cmd);
}
@@ -226,11 +222,11 @@ namespace OpenSim.Data.SQLite
{
IDataReader reader;
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
cmd.CommandText = String.Format("select inventoryCurrentPermissions from inventoryitems where avatarID = :PrincipalID and assetID = :AssetID", m_Realm);
cmd.Parameters.Add(new SqliteParameter(":PrincipalID", principalID.ToString()));
cmd.Parameters.Add(new SqliteParameter(":AssetID", assetID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":PrincipalID", principalID.ToString()));
cmd.Parameters.Add(new SQLiteParameter(":AssetID", assetID.ToString()));
reader = ExecuteReader(cmd, m_Connection);
}
@@ -275,11 +271,11 @@ namespace OpenSim.Data.SQLite
UUID oldParentFolderUUID = folders[0].parentFolderID;
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
cmd.CommandText = String.Format("update {0} set parentFolderID = :ParentFolderID where folderID = :FolderID", m_Realm);
cmd.Parameters.Add(new SqliteParameter(":ParentFolderID", newParentFolderID));
cmd.Parameters.Add(new SqliteParameter(":FolderID", id));
cmd.Parameters.Add(new SQLiteParameter(":ParentFolderID", newParentFolderID));
cmd.Parameters.Add(new SQLiteParameter(":FolderID", id));
if (ExecuteNonQuery(cmd, m_Connection) == 0)
return false;
@@ -307,10 +303,10 @@ namespace OpenSim.Data.SQLite
// m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
// Util.PrintCallStack();
using (SqliteCommand cmd = new SqliteCommand())
using (SQLiteCommand cmd = new SQLiteCommand())
{
cmd.CommandText = "update inventoryfolders set version=version+1 where folderID = :folderID";
cmd.Parameters.Add(new SqliteParameter(":folderID", folderID));
cmd.Parameters.Add(new SQLiteParameter(":folderID", folderID));
if(ExecuteNonQuery(cmd, m_Connection) == 0)
return false;

12
OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using Mono.Data.Sqlite;
using System.Data.SQLite;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Region.Framework.Scenes;
@@ -73,7 +73,7 @@ namespace OpenSim.Region.UserStatistics
public Hashtable ProcessModel(Hashtable pParams)
{
SqliteConnection dbConn = (SqliteConnection)pParams["DatabaseConnection"];
SQLiteConnection dbConn = (SQLiteConnection)pParams["DatabaseConnection"];
List<ClientVersionData> clidata = new List<ClientVersionData>();
@@ -90,8 +90,8 @@ namespace OpenSim.Region.UserStatistics
{
string sql = "select count(distinct region_id) as regcnt from stats_session_data";
SqliteCommand cmd = new SqliteCommand(sql, dbConn);
SqliteDataReader sdr = cmd.ExecuteReader();
SQLiteCommand cmd = new SQLiteCommand(sql, dbConn);
SQLiteDataReader sdr = cmd.ExecuteReader();
if (sdr.HasRows)
{
sdr.Read();
@@ -103,7 +103,7 @@ namespace OpenSim.Region.UserStatistics
sql =
"select client_version, count(*) as cnt, avg(avg_sim_fps) as simfps from stats_session_data group by client_version order by count(*) desc LIMIT 10;";
cmd = new SqliteCommand(sql, dbConn);
cmd = new SQLiteCommand(sql, dbConn);
sdr = cmd.ExecuteReader();
if (sdr.HasRows)
{
@@ -125,7 +125,7 @@ namespace OpenSim.Region.UserStatistics
{
sql =
"select region_id, client_version, count(*) as cnt, avg(avg_sim_fps) as simfps from stats_session_data group by region_id, client_version order by region_id, count(*) desc;";
cmd = new SqliteCommand(sql, dbConn);
cmd = new SQLiteCommand(sql, dbConn);
sdr = cmd.ExecuteReader();

10
OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
View File

@@ -30,7 +30,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using Mono.Data.Sqlite;
using System.Data.SQLite;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Region.Framework.Scenes;
@@ -51,7 +51,7 @@ namespace OpenSim.Region.UserStatistics
public Hashtable ProcessModel(Hashtable pParams)
{
SqliteConnection conn = (SqliteConnection)pParams["DatabaseConnection"];
SQLiteConnection conn = (SQLiteConnection)pParams["DatabaseConnection"];
List<Scene> m_scene = (List<Scene>)pParams["Scenes"];
stats_default_page_values mData = rep_DefaultReport_data(conn, m_scene);
@@ -202,7 +202,7 @@ TD.align_top { vertical-align: top; }
public stats_default_page_values rep_DefaultReport_data(SqliteConnection db, List<Scene> m_scene)
public stats_default_page_values rep_DefaultReport_data(SQLiteConnection db, List<Scene> m_scene)
{
stats_default_page_values returnstruct = new stats_default_page_values();
returnstruct.all_scenes = m_scene.ToArray();
@@ -212,8 +212,8 @@ TD.align_top { vertical-align: top; }
AVG(avg_sim_fps) as savg_sim_fps, AVG(avg_ping) as sav_ping, SUM(n_out_kb) as num_in_kb,
SUM(n_out_pk) as num_in_packets, SUM(n_in_kb) as num_out_kb, SUM(n_in_pk) as num_out_packets, AVG(mem_use) as sav_mem_use
FROM stats_session_data;";
SqliteCommand cmd = new SqliteCommand(SQL, db);
SqliteDataReader sdr = cmd.ExecuteReader();
SQLiteCommand cmd = new SQLiteCommand(SQL, db);
SQLiteDataReader sdr = cmd.ExecuteReader();
if (sdr.HasRows)
{
sdr.Read();

2
OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
View File

@@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
using Mono.Data.Sqlite;
using System.Data.SQLite;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Region.Framework.Scenes;

12
OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using Mono.Data.Sqlite;
using System.Data.SQLite;
using OpenMetaverse;
using OpenSim.Framework;
@@ -49,7 +49,7 @@ namespace OpenSim.Region.UserStatistics
Hashtable modeldata = new Hashtable();
modeldata.Add("Scenes", pParams["Scenes"]);
modeldata.Add("Reports", pParams["Reports"]);
SqliteConnection dbConn = (SqliteConnection)pParams["DatabaseConnection"];
SQLiteConnection dbConn = (SQLiteConnection)pParams["DatabaseConnection"];
List<SessionList> lstSessions = new List<SessionList>();
Hashtable requestvars = (Hashtable) pParams["RequestVars"];
@@ -105,14 +105,14 @@ namespace OpenSim.Region.UserStatistics
sql += " ORDER BY a.name_f, a.name_l, b.last_updated;";
SqliteCommand cmd = new SqliteCommand(sql, dbConn);
SQLiteCommand cmd = new SQLiteCommand(sql, dbConn);
if (puserUUID.Length > 0)
cmd.Parameters.Add(new SqliteParameter(":agent_id", puserUUID));
cmd.Parameters.Add(new SQLiteParameter(":agent_id", puserUUID));
if (clientVersionString.Length > 0)
cmd.Parameters.Add(new SqliteParameter(":client_version", clientVersionString));
cmd.Parameters.Add(new SQLiteParameter(":client_version", clientVersionString));
SqliteDataReader sdr = cmd.ExecuteReader();
SQLiteDataReader sdr = cmd.ExecuteReader();
if (sdr.HasRows)
{

2
OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
View File

@@ -30,7 +30,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using Mono.Data.Sqlite;
using System.Data.SQLite;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Region.Framework.Scenes;

114
OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
View File

@@ -42,7 +42,7 @@ using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Mono.Data.Sqlite;
using System.Data.SQLite;
using Mono.Addins;
using Caps = OpenSim.Framework.Capabilities.Caps;
@@ -58,7 +58,7 @@ namespace OpenSim.Region.UserStatistics
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static SqliteConnection dbConn;
private static SQLiteConnection dbConn;
/// <summary>
/// User statistics sessions keyed by agent ID
@@ -91,11 +91,11 @@ namespace OpenSim.Region.UserStatistics
if (!enabled)
return;
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteConnection).Assembly);
//IConfig startupConfig = config.Configs["Startup"];
dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3");
dbConn = new SQLiteConnection("URI=file:LocalUserStatistics.db");
dbConn.Open();
CreateTables(dbConn);
@@ -329,9 +329,9 @@ namespace OpenSim.Region.UserStatistics
return responsedata;
}
private void CreateTables(SqliteConnection db)
private void CreateTables(SQLiteConnection db)
{
using (SqliteCommand createcmd = new SqliteCommand(SQL_STATS_TABLE_CREATE, db))
using (SQLiteCommand createcmd = new SQLiteCommand(SQL_STATS_TABLE_CREATE, db))
{
createcmd.ExecuteNonQuery();
}
@@ -619,7 +619,7 @@ namespace OpenSim.Region.UserStatistics
return uid;
}
private void UpdateUserStats(UserSession uid, SqliteConnection db)
private void UpdateUserStats(UserSession uid, SQLiteConnection db)
{
// m_log.DebugFormat(
// "[WEB STATS MODULE]: Updating user stats for {0} {1}, session {2}", uid.name_f, uid.name_l, uid.session_id);
@@ -629,62 +629,62 @@ namespace OpenSim.Region.UserStatistics
lock (db)
{
using (SqliteCommand updatecmd = new SqliteCommand(SQL_STATS_TABLE_INSERT, db))
using (SQLiteCommand updatecmd = new SQLiteCommand(SQL_STATS_TABLE_INSERT, db))
{
updatecmd.Parameters.Add(new SqliteParameter(":session_id", uid.session_data.session_id.ToString()));
updatecmd.Parameters.Add(new SqliteParameter(":agent_id", uid.session_data.agent_id.ToString()));
updatecmd.Parameters.Add(new SqliteParameter(":region_id", uid.session_data.region_id.ToString()));
updatecmd.Parameters.Add(new SqliteParameter(":last_updated", (int) uid.session_data.last_updated));
updatecmd.Parameters.Add(new SqliteParameter(":remote_ip", uid.session_data.remote_ip));
updatecmd.Parameters.Add(new SqliteParameter(":name_f", uid.session_data.name_f));
updatecmd.Parameters.Add(new SqliteParameter(":name_l", uid.session_data.name_l));
updatecmd.Parameters.Add(new SqliteParameter(":avg_agents_in_view", uid.session_data.avg_agents_in_view));
updatecmd.Parameters.Add(new SqliteParameter(":min_agents_in_view",
updatecmd.Parameters.Add(new SQLiteParameter(":session_id", uid.session_data.session_id.ToString()));
updatecmd.Parameters.Add(new SQLiteParameter(":agent_id", uid.session_data.agent_id.ToString()));
updatecmd.Parameters.Add(new SQLiteParameter(":region_id", uid.session_data.region_id.ToString()));
updatecmd.Parameters.Add(new SQLiteParameter(":last_updated", (int) uid.session_data.last_updated));
updatecmd.Parameters.Add(new SQLiteParameter(":remote_ip", uid.session_data.remote_ip));
updatecmd.Parameters.Add(new SQLiteParameter(":name_f", uid.session_data.name_f));
updatecmd.Parameters.Add(new SQLiteParameter(":name_l", uid.session_data.name_l));
updatecmd.Parameters.Add(new SQLiteParameter(":avg_agents_in_view", uid.session_data.avg_agents_in_view));
updatecmd.Parameters.Add(new SQLiteParameter(":min_agents_in_view",
(int) uid.session_data.min_agents_in_view));
updatecmd.Parameters.Add(new SqliteParameter(":max_agents_in_view",
updatecmd.Parameters.Add(new SQLiteParameter(":max_agents_in_view",
(int) uid.session_data.max_agents_in_view));
updatecmd.Parameters.Add(new SqliteParameter(":mode_agents_in_view",
updatecmd.Parameters.Add(new SQLiteParameter(":mode_agents_in_view",
(int) uid.session_data.mode_agents_in_view));
updatecmd.Parameters.Add(new SqliteParameter(":avg_fps", uid.session_data.avg_fps));
updatecmd.Parameters.Add(new SqliteParameter(":min_fps", uid.session_data.min_fps));
updatecmd.Parameters.Add(new SqliteParameter(":max_fps", uid.session_data.max_fps));
updatecmd.Parameters.Add(new SqliteParameter(":mode_fps", uid.session_data.mode_fps));
updatecmd.Parameters.Add(new SqliteParameter(":a_language", uid.session_data.a_language));
updatecmd.Parameters.Add(new SqliteParameter(":mem_use", uid.session_data.mem_use));
updatecmd.Parameters.Add(new SqliteParameter(":meters_traveled", uid.session_data.meters_traveled));
updatecmd.Parameters.Add(new SqliteParameter(":avg_ping", uid.session_data.avg_ping));
updatecmd.Parameters.Add(new SqliteParameter(":min_ping", uid.session_data.min_ping));
updatecmd.Parameters.Add(new SqliteParameter(":max_ping", uid.session_data.max_ping));
updatecmd.Parameters.Add(new SqliteParameter(":mode_ping", uid.session_data.mode_ping));
updatecmd.Parameters.Add(new SqliteParameter(":regions_visited", uid.session_data.regions_visited));
updatecmd.Parameters.Add(new SqliteParameter(":run_time", uid.session_data.run_time));
updatecmd.Parameters.Add(new SqliteParameter(":avg_sim_fps", uid.session_data.avg_sim_fps));
updatecmd.Parameters.Add(new SqliteParameter(":min_sim_fps", uid.session_data.min_sim_fps));
updatecmd.Parameters.Add(new SqliteParameter(":max_sim_fps", uid.session_data.max_sim_fps));
updatecmd.Parameters.Add(new SqliteParameter(":mode_sim_fps", uid.session_data.mode_sim_fps));
updatecmd.Parameters.Add(new SqliteParameter(":start_time", uid.session_data.start_time));
updatecmd.Parameters.Add(new SqliteParameter(":client_version", uid.session_data.client_version));
updatecmd.Parameters.Add(new SqliteParameter(":s_cpu", uid.session_data.s_cpu));
updatecmd.Parameters.Add(new SqliteParameter(":s_gpu", uid.session_data.s_gpu));
updatecmd.Parameters.Add(new SqliteParameter(":s_os", uid.session_data.s_os));
updatecmd.Parameters.Add(new SqliteParameter(":s_ram", uid.session_data.s_ram));
updatecmd.Parameters.Add(new SqliteParameter(":d_object_kb", uid.session_data.d_object_kb));
updatecmd.Parameters.Add(new SqliteParameter(":d_texture_kb", uid.session_data.d_texture_kb));
updatecmd.Parameters.Add(new SqliteParameter(":d_world_kb", uid.session_data.d_world_kb));
updatecmd.Parameters.Add(new SqliteParameter(":n_in_kb", uid.session_data.n_in_kb));
updatecmd.Parameters.Add(new SqliteParameter(":n_in_pk", uid.session_data.n_in_pk));
updatecmd.Parameters.Add(new SqliteParameter(":n_out_kb", uid.session_data.n_out_kb));
updatecmd.Parameters.Add(new SqliteParameter(":n_out_pk", uid.session_data.n_out_pk));
updatecmd.Parameters.Add(new SqliteParameter(":f_dropped", uid.session_data.f_dropped));
updatecmd.Parameters.Add(new SqliteParameter(":f_failed_resends", uid.session_data.f_failed_resends));
updatecmd.Parameters.Add(new SqliteParameter(":f_invalid", uid.session_data.f_invalid));
updatecmd.Parameters.Add(new SqliteParameter(":f_off_circuit", uid.session_data.f_off_circuit));
updatecmd.Parameters.Add(new SqliteParameter(":f_resent", uid.session_data.f_resent));
updatecmd.Parameters.Add(new SqliteParameter(":f_send_packet", uid.session_data.f_send_packet));
updatecmd.Parameters.Add(new SQLiteParameter(":avg_fps", uid.session_data.avg_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":min_fps", uid.session_data.min_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":max_fps", uid.session_data.max_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":mode_fps", uid.session_data.mode_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":a_language", uid.session_data.a_language));
updatecmd.Parameters.Add(new SQLiteParameter(":mem_use", uid.session_data.mem_use));
updatecmd.Parameters.Add(new SQLiteParameter(":meters_traveled", uid.session_data.meters_traveled));
updatecmd.Parameters.Add(new SQLiteParameter(":avg_ping", uid.session_data.avg_ping));
updatecmd.Parameters.Add(new SQLiteParameter(":min_ping", uid.session_data.min_ping));
updatecmd.Parameters.Add(new SQLiteParameter(":max_ping", uid.session_data.max_ping));
updatecmd.Parameters.Add(new SQLiteParameter(":mode_ping", uid.session_data.mode_ping));
updatecmd.Parameters.Add(new SQLiteParameter(":regions_visited", uid.session_data.regions_visited));
updatecmd.Parameters.Add(new SQLiteParameter(":run_time", uid.session_data.run_time));
updatecmd.Parameters.Add(new SQLiteParameter(":avg_sim_fps", uid.session_data.avg_sim_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":min_sim_fps", uid.session_data.min_sim_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":max_sim_fps", uid.session_data.max_sim_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":mode_sim_fps", uid.session_data.mode_sim_fps));
updatecmd.Parameters.Add(new SQLiteParameter(":start_time", uid.session_data.start_time));
updatecmd.Parameters.Add(new SQLiteParameter(":client_version", uid.session_data.client_version));
updatecmd.Parameters.Add(new SQLiteParameter(":s_cpu", uid.session_data.s_cpu));
updatecmd.Parameters.Add(new SQLiteParameter(":s_gpu", uid.session_data.s_gpu));
updatecmd.Parameters.Add(new SQLiteParameter(":s_os", uid.session_data.s_os));
updatecmd.Parameters.Add(new SQLiteParameter(":s_ram", uid.session_data.s_ram));
updatecmd.Parameters.Add(new SQLiteParameter(":d_object_kb", uid.session_data.d_object_kb));
updatecmd.Parameters.Add(new SQLiteParameter(":d_texture_kb", uid.session_data.d_texture_kb));
updatecmd.Parameters.Add(new SQLiteParameter(":d_world_kb", uid.session_data.d_world_kb));
updatecmd.Parameters.Add(new SQLiteParameter(":n_in_kb", uid.session_data.n_in_kb));
updatecmd.Parameters.Add(new SQLiteParameter(":n_in_pk", uid.session_data.n_in_pk));
updatecmd.Parameters.Add(new SQLiteParameter(":n_out_kb", uid.session_data.n_out_kb));
updatecmd.Parameters.Add(new SQLiteParameter(":n_out_pk", uid.session_data.n_out_pk));
updatecmd.Parameters.Add(new SQLiteParameter(":f_dropped", uid.session_data.f_dropped));
updatecmd.Parameters.Add(new SQLiteParameter(":f_failed_resends", uid.session_data.f_failed_resends));
updatecmd.Parameters.Add(new SQLiteParameter(":f_invalid", uid.session_data.f_invalid));
updatecmd.Parameters.Add(new SQLiteParameter(":f_off_circuit", uid.session_data.f_off_circuit));
updatecmd.Parameters.Add(new SQLiteParameter(":f_resent", uid.session_data.f_resent));
updatecmd.Parameters.Add(new SQLiteParameter(":f_send_packet", uid.session_data.f_send_packet));
// StringBuilder parameters = new StringBuilder();
// SqliteParameterCollection spc = updatecmd.Parameters;
// foreach (SqliteParameter sp in spc)
// SQLiteParameterCollection spc = updatecmd.Parameters;
// foreach (SQLiteParameter sp in spc)
// parameters.AppendFormat("{0}={1},", sp.ParameterName, sp.Value);
//
// m_log.DebugFormat("[WEB STATS MODULE]: Parameters {0}", parameters);

20
bin/config-include/storage/SQLiteStandalone.ini
View File

@@ -2,10 +2,10 @@
[DatabaseService]
StorageProvider = "OpenSim.Data.SQLite.dll"
ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
ConnectionString = "URI=file:OpenSim.db;UseUTF16Encoding=True"
[AssetService]
ConnectionString = "URI=file:Asset.db,version=3"
ConnectionString = "URI=file:Asset.db"
; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration.
; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead.
@@ -15,25 +15,25 @@
; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and
; do not have separate connection strings for different services.
[HGAssetService]
ConnectionString = "URI=file:Asset.db,version=3"
ConnectionString = "URI=file:Asset.db"
[InventoryService]
;ConnectionString = "URI=file:inventory.db,version=3"
;ConnectionString = "URI=file:inventory.db"
; if you have a legacy inventory store use the connection string below
ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True"
ConnectionString = "URI=file:inventory.db;UseUTF16Encoding=True"
[AvatarService]
ConnectionString = "URI=file:avatars.db,version=3"
ConnectionString = "URI=file:avatars.db"
[AuthenticationService]
ConnectionString = "URI=file:auth.db,version=3"
ConnectionString = "URI=file:auth.db"
[UserAccountService]
ConnectionString = "URI=file:userprofiles.db,version=3"
ConnectionString = "URI=file:userprofiles.db"
[GridUserService]
ConnectionString = "URI=file:griduser.db,version=3"
ConnectionString = "URI=file:griduser.db"
[FriendsService]
ConnectionString = "URI=file:friends.db,version=3"
ConnectionString = "URI=file:friends.db"

6
prebuild.xml
View File

@@ -1284,7 +1284,7 @@
<Reference name="OpenMetaverseTypes"/>
<Reference name="OpenMetaverse"/>
<Reference name="OpenMetaverse.StructuredData"/>
<Reference name="Mono.Data.Sqlite"/>
<Reference name="System.Data.SQLite"/>
<Reference name="Mono.Addins"/>
<Reference name="log4net"/>
@@ -1382,7 +1382,7 @@
<Reference name="OpenMetaverseTypes"/>
<Reference name="OpenMetaverse.StructuredData"/>
<Reference name="OpenMetaverse"/>
<Reference name="Mono.Data.Sqlite"/>
<Reference name="System.Data.SQLite"/>
<Reference name="netcd"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Capabilities"/>
@@ -2294,7 +2294,7 @@
<Reference name="OpenSim.Data.SQLite"/>
<Reference name="MySql.Data"/>
<Reference name="Mono.Data.Sqlite"/>
<Reference name="System.Data.SQLite"/>
<Files>
<Match pattern="*.cs" recurse="true">
<Exclude name="obj" pattern="obj"/>