mirror of
https://github.com/opensim/opensim.git
synced 2026-05-14 18:55:39 +08:00
mantis 9219: update SQLite to System.Data.Sqlite 2.0.2 (native 3.50.4.5). Must run prebuild. This needs testing :(
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user