ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects 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

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();
}
}