Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 106 insertions, 106 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
index 961593f..c999433 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLInventoryData.cs
@@ -28,18 +28,18 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
+using Npgsql;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
     /// <summary>
-    /// A MSSQL interface for the inventory server
+    /// A PGSQL interface for the inventory server
     /// </summary>
-    public class MSSQLInventoryData : IInventoryDataPlugin
+    public class PGSQLInventoryData : IInventoryDataPlugin
     {
         private const string _migrationStore = "InventoryStore";
 
@@ -48,7 +48,7 @@ namespace OpenSim.Data.MSSQL
         /// <summary>
         /// The database manager
         /// </summary>
-        private MSSQLManager database;
+        private PGSQLManager database;
         private string m_connectionString;
 
         #region IPlugin members
@@ -56,19 +56,19 @@ namespace OpenSim.Data.MSSQL
         [Obsolete("Cannot be default-initialized!")]
         public void Initialise()
         {
-            m_log.Info("[MSSQLInventoryData]: " + Name + " cannot be default-initialized!");
+            m_log.Info("[PGSQLInventoryData]: " + Name + " cannot be default-initialized!");
             throw new PluginNotInitialisedException(Name);
         }
 
         /// <summary>
-        /// Loads and initialises the MSSQL inventory storage interface
+        /// Loads and initialises the PGSQL inventory storage interface
         /// </summary>
         /// <param name="connectionString">connect string</param>
-        /// <remarks>use mssql_connection.ini</remarks>
+        /// <remarks>use PGSQL_connection.ini</remarks>
         public void Initialise(string connectionString)
         {
             m_connectionString = connectionString;
-            database = new MSSQLManager(connectionString);
+            database = new PGSQLManager(connectionString);
           
             //New migrations check of store
             database.CheckMigration(_migrationStore);
@@ -80,7 +80,7 @@ namespace OpenSim.Data.MSSQL
         /// <returns>A string containing the name of the DB provider</returns>
         public string Name
         {
-            get { return "MSSQL Inventory Data Interface"; }
+            get { return "PGSQL Inventory Data Interface"; }
         }
 
         /// <summary>
@@ -158,13 +158,13 @@ namespace OpenSim.Data.MSSQL
         /// <returns>A folder class</returns>
         public InventoryFolderBase getInventoryFolder(UUID folderID)
         {
-            string sql = "SELECT * FROM inventoryfolders WHERE folderID = @folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = "SELECT * FROM inventoryfolders WHERE \"folderID\" = :folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("folderID", folderID));
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
                     {
@@ -200,11 +200,11 @@ namespace OpenSim.Data.MSSQL
             if (parentID == UUID.Zero)
                 return folders;
 
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = "SELECT * FROM inventoryfolders WHERE \"parentFolderID\" = :parentID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(database.CreateParameter("@parentID", parentID));
+                cmd.Parameters.Add(database.CreateParameter("parentID", parentID));
                 conn.Open();
                 folders.AddRange(getInventoryFolders(cmd));
 
@@ -228,8 +228,8 @@ namespace OpenSim.Data.MSSQL
         /// <param name="folder">Folder to create</param>
         public void addInventoryFolder(InventoryFolderBase folder)
         {
-            string sql = @"INSERT INTO inventoryfolders ([folderID], [agentID], [parentFolderID], [folderName], [type], [version]) 
-                            VALUES (@folderID, @agentID, @parentFolderID, @folderName, @type, @version);";
+            string sql = "INSERT INTO inventoryfolders (\"folderID\", \"agentID\", \"parentFolderID\", \"folderName\", type, version) " +
+                         "   VALUES (:folderID, :agentID, :parentFolderID, :folderName, :type, :version);";
 
             string folderName = folder.Name;
             if (folderName.Length > 64)
@@ -237,8 +237,8 @@ namespace OpenSim.Data.MSSQL
                 folderName = folderName.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on add");
             }
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
                 cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
@@ -264,12 +264,12 @@ namespace OpenSim.Data.MSSQL
         /// <param name="folder">Folder to update</param>
         public void updateInventoryFolder(InventoryFolderBase folder)
         {
-            string sql = @"UPDATE inventoryfolders SET agentID = @agentID, 
-                                                       parentFolderID = @parentFolderID,
-                                                       folderName = @folderName,
-                                                       type = @type,
-                                                       version = @version 
-                           WHERE folderID = @folderID";
+            string sql = @"UPDATE inventoryfolders SET ""agentID"" = :agentID, 
+                                                       ""parentFolderID"" = :parentFolderID,
+                                                       ""folderName"" = :folderName,
+                                                       type = :type,
+                                                       version = :version 
+                           WHERE folderID = :folderID";
 
             string folderName = folder.Name;
             if (folderName.Length > 64)
@@ -277,8 +277,8 @@ namespace OpenSim.Data.MSSQL
                 folderName = folderName.Substring(0, 64);
                 m_log.Warn("[INVENTORY DB]: Name field truncated from " + folder.Name.Length.ToString() + " to " + folderName.Length + " characters on update");
             }
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
                 cmd.Parameters.Add(database.CreateParameter("agentID", folder.Owner));
@@ -304,9 +304,9 @@ namespace OpenSim.Data.MSSQL
         /// <param name="folder">Folder to update</param>
         public void moveInventoryFolder(InventoryFolderBase folder)
         {
-            string sql = @"UPDATE inventoryfolders SET parentFolderID = @parentFolderID WHERE folderID = @folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = @"UPDATE inventoryfolders SET ""parentFolderID"" = :parentFolderID WHERE ""folderID"" = :folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("parentFolderID", folder.ParentID));
                 cmd.Parameters.Add(database.CreateParameter("folderID", folder.ID));
@@ -328,13 +328,13 @@ namespace OpenSim.Data.MSSQL
         /// <param name="folderID">Id of folder to delete</param>
         public void deleteInventoryFolder(UUID folderID)
         {
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID";
+            string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID";
 
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 List<InventoryFolderBase> subFolders;
-                cmd.Parameters.Add(database.CreateParameter("@parentID", UUID.Zero));
+                cmd.Parameters.Add(database.CreateParameter("parentID", UUID.Zero));
                 conn.Open();
                 subFolders = getFolderHierarchy(folderID, cmd);
                 
@@ -363,15 +363,15 @@ namespace OpenSim.Data.MSSQL
         /// <returns>A list containing inventory items</returns>
         public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
-            string sql = "SELECT * FROM inventoryitems WHERE parentFolderID = @parentFolderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = @"SELECT * FROM inventoryitems WHERE ""parentFolderID"" = :parentFolderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("parentFolderID", folderID));
                 conn.Open();
                 List<InventoryItemBase> items = new List<InventoryItemBase>();
 
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
                     {
@@ -389,13 +389,13 @@ namespace OpenSim.Data.MSSQL
         /// <returns>An inventory item</returns>
         public InventoryItemBase getInventoryItem(UUID itemID)
         {
-            string sql = "SELECT * FROM inventoryitems WHERE inventoryID = @inventoryID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = @"SELECT * FROM inventoryitems WHERE ""inventoryID"" = :inventoryID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
                     {
@@ -421,15 +421,15 @@ namespace OpenSim.Data.MSSQL
             }
 
             string sql = @"INSERT INTO inventoryitems 
-                            ([inventoryID], [assetID], [assetType], [parentFolderID], [avatarID], [inventoryName], 
-                             [inventoryDescription], [inventoryNextPermissions], [inventoryCurrentPermissions],
-                             [invType], [creatorID], [inventoryBasePermissions], [inventoryEveryOnePermissions], [inventoryGroupPermissions],
-                             [salePrice], [saleType], [creationDate], [groupID], [groupOwned], [flags]) 
+                            (""inventoryID"", ""assetID"", ""assetType"", ""parentFolderID"", ""avatarID"", ""inventoryName"", 
+                             ""inventoryDescription"", ""inventoryNextPermissions"", ""inventoryCurrentPermissions"",
+                             ""invType"", ""creatorID"", ""inventoryBasePermissions"", ""inventoryEveryOnePermissions"", ""inventoryGroupPermissions"",
+                             ""salePrice"", ""SaleType"", ""creationDate"", ""groupID"", ""groupOwned"", flags) 
                         VALUES
-                            (@inventoryID, @assetID, @assetType, @parentFolderID, @avatarID, @inventoryName, @inventoryDescription,
-                             @inventoryNextPermissions, @inventoryCurrentPermissions, @invType, @creatorID,
-                             @inventoryBasePermissions, @inventoryEveryOnePermissions, @inventoryGroupPermissions, @salePrice, @saleType,
-                             @creationDate, @groupID, @groupOwned, @flags)";
+                            (:inventoryID, :assetID, :assetType, :parentFolderID, :avatarID, :inventoryName, :inventoryDescription,
+                             :inventoryNextPermissions, :inventoryCurrentPermissions, :invType, :creatorID,
+                             :inventoryBasePermissions, :inventoryEveryOnePermissions, :inventoryGroupPermissions, :SalePrice, :SaleType,
+                             :creationDate, :groupID, :groupOwned, :flags)";
             
             string itemName = item.Name;
             if (item.Name.Length > 64)
@@ -445,8 +445,8 @@ namespace OpenSim.Data.MSSQL
                 m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters");
             }
 
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
             {
                 command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
                 command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
@@ -462,8 +462,8 @@ namespace OpenSim.Data.MSSQL
                 command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
                 command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
                 command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
-                command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice));
-                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
+                command.Parameters.Add(database.CreateParameter("SalePrice", item.SalePrice));
+                command.Parameters.Add(database.CreateParameter("SaleType", item.SaleType));
                 command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
                 command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
                 command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
@@ -479,9 +479,9 @@ namespace OpenSim.Data.MSSQL
                 }
             }
 
-            sql = "UPDATE inventoryfolders SET version = version + 1 WHERE folderID = @folderID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            sql = @"UPDATE inventoryfolders SET version = version + 1 WHERE ""folderID"" = @folderID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
             {
                 command.Parameters.Add(database.CreateParameter("folderID", item.Folder.ToString()));
                 conn.Open();
@@ -502,26 +502,26 @@ namespace OpenSim.Data.MSSQL
         /// <param name="item">Inventory item to update</param>
         public void updateInventoryItem(InventoryItemBase item)
         {
-            string sql = @"UPDATE inventoryitems SET assetID = @assetID, 
-                                                assetType = @assetType,
-                                                parentFolderID = @parentFolderID,
-                                                avatarID = @avatarID,
-                                                inventoryName = @inventoryName, 
-                                                inventoryDescription = @inventoryDescription, 
-                                                inventoryNextPermissions = @inventoryNextPermissions, 
-                                                inventoryCurrentPermissions = @inventoryCurrentPermissions, 
-                                                invType = @invType, 
-                                                creatorID = @creatorID, 
-                                                inventoryBasePermissions = @inventoryBasePermissions, 
-                                                inventoryEveryOnePermissions = @inventoryEveryOnePermissions, 
-                                                inventoryGroupPermissions = @inventoryGroupPermissions, 
-                                                salePrice = @salePrice, 
-                                                saleType = @saleType, 
-                                                creationDate = @creationDate, 
-                                                groupID = @groupID, 
-                                                groupOwned = @groupOwned, 
-                                                flags = @flags 
-                                        WHERE inventoryID = @inventoryID";
+            string sql = @"UPDATE inventoryitems SET ""assetID"" = :assetID, 
+                                                ""assetType"" = :assetType,
+                                                ""parentFolderID"" = :parentFolderID,
+                                                ""avatarID"" = :avatarID,
+                                                ""inventoryName"" = :inventoryName, 
+                                                ""inventoryDescription"" = :inventoryDescription, 
+                                                ""inventoryNextPermissions"" = :inventoryNextPermissions, 
+                                                ""inventoryCurrentPermissions"" = :inventoryCurrentPermissions, 
+                                                ""invType"" = :invType, 
+                                                ""creatorID"" = :creatorID, 
+                                                ""inventoryBasePermissions"" = :inventoryBasePermissions, 
+                                                ""inventoryEveryOnePermissions"" = :inventoryEveryOnePermissions, 
+                                                ""inventoryGroupPermissions"" = :inventoryGroupPermissions, 
+                                                ""salePrice"" = :SalePrice, 
+                                                ""saleType"" = :SaleType, 
+                                                ""creationDate"" = :creationDate, 
+                                                ""groupID"" = :groupID, 
+                                                ""groupOwned"" = :groupOwned, 
+                                                flags = :flags 
+                                        WHERE ""inventoryID"" = :inventoryID";
 
             string itemName = item.Name;
             if (item.Name.Length > 64)
@@ -537,8 +537,8 @@ namespace OpenSim.Data.MSSQL
                 m_log.Warn("[INVENTORY DB]: Description field truncated from " + item.Description.Length.ToString() + " to " + itemDesc.Length.ToString() + " characters on update");
             }
 
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
             {
                 command.Parameters.Add(database.CreateParameter("inventoryID", item.ID));
                 command.Parameters.Add(database.CreateParameter("assetID", item.AssetID));
@@ -554,8 +554,8 @@ namespace OpenSim.Data.MSSQL
                 command.Parameters.Add(database.CreateParameter("inventoryBasePermissions", item.BasePermissions));
                 command.Parameters.Add(database.CreateParameter("inventoryEveryOnePermissions", item.EveryOnePermissions));
                 command.Parameters.Add(database.CreateParameter("inventoryGroupPermissions", item.GroupPermissions));
-                command.Parameters.Add(database.CreateParameter("salePrice", item.SalePrice));
-                command.Parameters.Add(database.CreateParameter("saleType", item.SaleType));
+                command.Parameters.Add(database.CreateParameter("SalePrice", item.SalePrice));
+                command.Parameters.Add(database.CreateParameter("SaleType", item.SaleType));
                 command.Parameters.Add(database.CreateParameter("creationDate", item.CreationDate));
                 command.Parameters.Add(database.CreateParameter("groupID", item.GroupID));
                 command.Parameters.Add(database.CreateParameter("groupOwned", item.GroupOwned));
@@ -580,9 +580,9 @@ namespace OpenSim.Data.MSSQL
         /// <param name="itemID">the item UUID</param>
         public void deleteInventoryItem(UUID itemID)
         {
-            string sql = "DELETE FROM inventoryitems WHERE inventoryID=@inventoryID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = @"DELETE FROM inventoryitems WHERE ""inventoryID""=:inventoryID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("inventoryID", itemID));
                 try
@@ -616,14 +616,14 @@ namespace OpenSim.Data.MSSQL
         /// </returns>
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
         {
-            string sql = "SELECT * FROM inventoryitems WHERE avatarId = @uuid AND assetType = @assetType and flags = 1";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = @"SELECT * FROM inventoryitems WHERE ""avatarID"" = :uuid AND ""assetType"" = :assetType and flags = 1";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 cmd.Parameters.Add(database.CreateParameter("uuid", avatarID));
                 cmd.Parameters.Add(database.CreateParameter("assetType", (int)AssetType.Gesture));
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     List<InventoryItemBase> gestureList = new List<InventoryItemBase>();
                     while (reader.Read())
@@ -644,9 +644,9 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="folderID">the item ID</param>
         /// <param name="connection">connection to the database</param>
-        private void DeleteItemsInFolder(UUID folderID, SqlConnection connection)
+        private void DeleteItemsInFolder(UUID folderID, NpgsqlConnection connection)
         {
-            using (SqlCommand command = new SqlCommand("DELETE FROM inventoryitems WHERE folderID=@folderID", connection))
+            using (NpgsqlCommand command = new NpgsqlCommand(@"DELETE FROM inventoryitems WHERE ""folderID""=:folderID", connection))
             {
                 command.Parameters.Add(database.CreateParameter("folderID", folderID));
 
@@ -667,9 +667,9 @@ namespace OpenSim.Data.MSSQL
         /// <param name="parentID">parent ID.</param>
         /// <param name="command">SQL command/connection to database</param>
         /// <returns></returns>
-        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, SqlCommand command)
+        private static List<InventoryFolderBase> getFolderHierarchy(UUID parentID, NpgsqlCommand command)
         {
-            command.Parameters["@parentID"].Value = parentID.Guid; //.ToString();
+            command.Parameters["parentID"].Value = parentID.Guid; //.ToString();
 
             List<InventoryFolderBase> folders = getInventoryFolders(command);
 
@@ -698,9 +698,9 @@ namespace OpenSim.Data.MSSQL
         /// <returns></returns>
         private List<InventoryFolderBase> getInventoryFolders(UUID parentID, UUID user)
         {
-            string sql = "SELECT * FROM inventoryfolders WHERE parentFolderID = @parentID AND agentID LIKE @uuid";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand command = new SqlCommand(sql, conn))
+            string sql = @"SELECT * FROM inventoryfolders WHERE ""parentFolderID"" = :parentID AND ""agentID"" = :uuid";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand command = new NpgsqlCommand(sql, conn))
             {
                 if (user == UUID.Zero)
                 {
@@ -721,9 +721,9 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="command">SQLcommand.</param>
         /// <returns></returns>
-        private static List<InventoryFolderBase> getInventoryFolders(SqlCommand command)
+        private static List<InventoryFolderBase> getInventoryFolders(NpgsqlCommand command)
         {
-            using (SqlDataReader reader = command.ExecuteReader())
+            using (NpgsqlDataReader reader = command.ExecuteReader())
             {
 
                 List<InventoryFolderBase> items = new List<InventoryFolderBase>();
@@ -738,9 +738,9 @@ namespace OpenSim.Data.MSSQL
         /// <summary>
         /// Reads a list of inventory folders returned by a query.
         /// </summary>
-        /// <param name="reader">A MSSQL Data Reader</param>
+        /// <param name="reader">A PGSQL Data Reader</param>
         /// <returns>A List containing inventory folders</returns>
-        protected static InventoryFolderBase readInventoryFolder(SqlDataReader reader)
+        protected static InventoryFolderBase readInventoryFolder(NpgsqlDataReader reader)
         {
             try
             {
@@ -796,7 +796,7 @@ namespace OpenSim.Data.MSSQL
 
                 return item;
             }
-            catch (SqlException e)
+            catch (NpgsqlException e)
             {
                 m_log.Error("[INVENTORY DB]: Error reading inventory item :" + e.Message);
             }
@@ -809,18 +809,18 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="folderID">the folder UUID</param>
         /// <param name="connection">connection to database</param>
-        private void DeleteOneFolder(UUID folderID, SqlConnection connection)
+        private void DeleteOneFolder(UUID folderID, NpgsqlConnection connection)
         {
             try
             {
-                using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection))
+                using (NpgsqlCommand command = new NpgsqlCommand(@"DELETE FROM inventoryfolders WHERE ""folderID""=:folderID and type=-1", connection))
                 {
                     command.Parameters.Add(database.CreateParameter("folderID", folderID));
 
                     command.ExecuteNonQuery();
                 }
             }
-            catch (SqlException e)
+            catch (NpgsqlException e)
             {
                 m_log.Error("[INVENTORY DB]: Error deleting folder :" + e.Message);
             }