From cc67de5b86ebcebadbe2ea46872a0dc63d99cae7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 30 Apr 2010 17:45:00 +0100
Subject: rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the
least evil way forward since mono 2.6 and later will see increasing usage,
and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE
REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in
OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See
the OpenSim.ini.example and StandaloneCommon.ini.example files for more
details This commit also temporarily changes unsigned ParentEstateID values
in the OpenSim.Data.Tests to signed temporarily, since the new plugin
enforces creation of signed fields in the database (which is what the SQL
actually specifies). And change data columns in sqlite is a pita.
---
OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs | 155 --------------------------
1 file changed, 155 deletions(-)
delete mode 100644 OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs
(limited to 'OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs')
diff --git a/OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs b/OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs
deleted file mode 100644
index a0c17f8..0000000
--- a/OpenSim/Data/SQLiteNG/SQLiteXInventoryData.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Data;
-using System.Reflection;
-using System.Collections.Generic;
-using Mono.Data.Sqlite;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Data.SQLiteNG
-{
- ///
- /// A MySQL Interface for the Asset Server
- ///
- public class SQLiteXInventoryData : IXInventoryData
- {
-// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- private SQLiteGenericTableHandler m_Folders;
- private SqliteItemHandler m_Items;
-
- public SQLiteXInventoryData(string conn, string realm)
- {
- m_Folders = new SQLiteGenericTableHandler(
- conn, "inventoryfolders", "InventoryStore");
- m_Items = new SqliteItemHandler(
- conn, "inventoryitems", String.Empty);
- }
-
- public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
- {
- return m_Folders.Get(fields, vals);
- }
-
- public XInventoryItem[] GetItems(string[] fields, string[] vals)
- {
- return m_Items.Get(fields, vals);
- }
-
- public bool StoreFolder(XInventoryFolder folder)
- {
- return m_Folders.Store(folder);
- }
-
- public bool StoreItem(XInventoryItem item)
- {
- return m_Items.Store(item);
- }
-
- public bool DeleteFolders(string field, string val)
- {
- return m_Folders.Delete(field, val);
- }
-
- public bool DeleteItems(string field, string val)
- {
- return m_Items.Delete(field, val);
- }
-
- public bool MoveItem(string id, string newParent)
- {
- return m_Items.MoveItem(id, newParent);
- }
-
- public XInventoryItem[] GetActiveGestures(UUID principalID)
- {
- return m_Items.GetActiveGestures(principalID);
- }
-
- public int GetAssetPermissions(UUID principalID, UUID assetID)
- {
- return m_Items.GetAssetPermissions(principalID, assetID);
- }
- }
-
- public class SqliteItemHandler : SQLiteGenericTableHandler
- {
- public SqliteItemHandler(string c, string t, string m) :
- base(c, t, m)
- {
- }
-
- public bool MoveItem(string id, string newParent)
- {
- 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));
-
- return ExecuteNonQuery(cmd, m_Connection) == 0 ? false : true;
- }
-
- public XInventoryItem[] GetActiveGestures(UUID principalID)
- {
- 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));
-
- return DoQuery(cmd);
- }
-
- public int GetAssetPermissions(UUID principalID, UUID assetID)
- {
- 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()));
-
- IDataReader reader = ExecuteReader(cmd, m_Connection);
-
- int perms = 0;
-
- while (reader.Read())
- {
- perms |= Convert.ToInt32(reader["inventoryCurrentPermissions"]);
- }
-
- reader.Close();
- //CloseCommand(cmd);
-
- return perms;
- }
- }
-}
--
cgit v1.1