1 files changed, 71 insertions, 46 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
index 9164ffe..a22b882 100644
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -31,29 +31,39 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Text;
 using log4net;
+using Npgsql;
+using NpgsqlTypes;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLXInventoryData : IXInventoryData
+    public class PGSQLXInventoryData : IXInventoryData
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(
 //                MethodBase.GetCurrentMethod().DeclaringType);
 
-        private MSSQLFolderHandler m_Folders;
-        private MSSQLItemHandler m_Items;
+        private PGSQLFolderHandler m_Folders;
+        private PGSQLItemHandler m_Items;
 
-        public MSSQLXInventoryData(string conn, string realm)
+        public PGSQLXInventoryData(string conn, string realm)
         {
-            m_Folders = new MSSQLFolderHandler(
+            m_Folders = new PGSQLFolderHandler(
                     conn, "inventoryfolders", "InventoryStore");
-            m_Items = new MSSQLItemHandler(
+            m_Items = new PGSQLItemHandler(
                     conn, "inventoryitems", String.Empty);
         }
 
+        public static UUID str2UUID(string strUUID)
+        {
+            UUID newUUID = UUID.Zero;
+
+            UUID.TryParse(strUUID, out newUUID);
+
+            return newUUID;
+        }
+
         public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
         {
             return m_Folders.Get(fields, vals);
@@ -113,7 +123,7 @@ namespace OpenSim.Data.MSSQL
 
         public XInventoryItem[] GetActiveGestures(UUID principalID)
         {
-            return m_Items.GetActiveGestures(principalID);
+            return m_Items.GetActiveGestures(principalID.ToString());
         }
 
         public int GetAssetPermissions(UUID principalID, UUID assetID)
@@ -122,9 +132,9 @@ namespace OpenSim.Data.MSSQL
         }
     }
 
-    public class MSSQLItemHandler : MSSQLInventoryHandler<XInventoryItem>
+    public class PGSQLItemHandler : PGSQLInventoryHandler<XInventoryItem>
     {
-        public MSSQLItemHandler(string c, string t, string m) :
+        public PGSQLItemHandler(string c, string t, string m) :
             base(c, t, m)
         {
         }
@@ -137,14 +147,13 @@ namespace OpenSim.Data.MSSQL
 
             UUID oldParent = retrievedItems[0].parentFolderID;
 
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             {
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                 {
-
-                    cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where inventoryID = @InventoryID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParent));
-                    cmd.Parameters.Add(m_database.CreateParameter("@InventoryID", id));
+                    cmd.CommandText = String.Format(@"update {0} set ""parentFolderID"" = :ParentFolderID where ""inventoryID"" = :InventoryID", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("ParentFolderID", newParent));
+                    cmd.Parameters.Add(m_database.CreateParameter("InventoryID", id ));
                     cmd.Connection = conn;
                     conn.Open();
 
@@ -159,16 +168,19 @@ namespace OpenSim.Data.MSSQL
             return true;
         }
 
-        public XInventoryItem[] GetActiveGestures(UUID principalID)
+        public XInventoryItem[] GetActiveGestures(string principalID)
         {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             {
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                 {
-                    cmd.CommandText = String.Format("select * from inventoryitems where avatarId = @uuid and assetType = @type and flags = 1", m_Realm);
+                    cmd.CommandText = String.Format(@"select * from inventoryitems where ""avatarID"" = :uuid and ""assetType"" = :type and ""flags"" = 1", m_Realm);
+
+                    UUID princID = UUID.Zero;
+                    UUID.TryParse(principalID, out princID);
 
-                    cmd.Parameters.Add(m_database.CreateParameter("@uuid", principalID.ToString()));
-                    cmd.Parameters.Add(m_database.CreateParameter("@type", (int)AssetType.Gesture));
+                    cmd.Parameters.Add(m_database.CreateParameter("uuid", principalID));
+                    cmd.Parameters.Add(m_database.CreateParameter("type", (int)AssetType.Gesture));
                     cmd.Connection = conn;
                     conn.Open();
                     return DoQuery(cmd);
@@ -178,16 +190,21 @@ namespace OpenSim.Data.MSSQL
 
         public int GetAssetPermissions(UUID principalID, UUID assetID)
         {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             {
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                 {
-                    cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = @PrincipalID and assetID = @AssetID group by assetID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
-                    cmd.Parameters.Add(m_database.CreateParameter("@AssetID", assetID.ToString()));
+                    cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" 
+                                 from inventoryitems 
+                                 where ""avatarID"" = :PrincipalID 
+                                   and ""assetID"" = :AssetID 
+                                 group by ""assetID"" ", m_Realm);
+
+                    cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID));
+                    cmd.Parameters.Add(m_database.CreateParameter("AssetID", assetID));
                     cmd.Connection = conn;
                     conn.Open();
-                    using (SqlDataReader reader = cmd.ExecuteReader())
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                     {
 
                         int perms = 0;
@@ -215,9 +232,9 @@ namespace OpenSim.Data.MSSQL
         }
     }
 
-    public class MSSQLFolderHandler : MSSQLInventoryHandler<XInventoryFolder>
+    public class PGSQLFolderHandler : PGSQLInventoryHandler<XInventoryFolder>
     {
-        public MSSQLFolderHandler(string c, string t, string m) :
+        public PGSQLFolderHandler(string c, string t, string m) :
             base(c, t, m)
         {
         }
@@ -231,14 +248,19 @@ namespace OpenSim.Data.MSSQL
 
             UUID oldParentFolderUUID = folders[0].parentFolderID;
 
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             {
-                using (SqlCommand cmd = new SqlCommand())
+                using (NpgsqlCommand cmd = new NpgsqlCommand())
                 {
+                    UUID foldID = UUID.Zero;
+                    UUID.TryParse(id, out foldID);
+
+                    UUID newPar = UUID.Zero;
+                    UUID.TryParse(newParentFolderID, out newPar);
 
-                    cmd.CommandText = String.Format("update {0} set parentFolderID = @ParentFolderID where folderID = @folderID", m_Realm);
-                    cmd.Parameters.Add(m_database.CreateParameter("@ParentFolderID", newParentFolderID));
-                    cmd.Parameters.Add(m_database.CreateParameter("@folderID", id));
+                    cmd.CommandText = String.Format(@"update {0} set ""parentFolderID"" = :ParentFolderID where ""folderID"" = :folderID", m_Realm);
+                    cmd.Parameters.Add(m_database.CreateParameter("ParentFolderID", newPar));
+                    cmd.Parameters.Add(m_database.CreateParameter("folderID", foldID));
                     cmd.Connection = conn;
                     conn.Open();
 
@@ -264,9 +286,9 @@ namespace OpenSim.Data.MSSQL
         }
     }
 
-    public class MSSQLInventoryHandler<T> : MSSQLGenericTableHandler<T> where T: class, new()
+    public class PGSQLInventoryHandler<T> : PGSQLGenericTableHandler<T> where T: class, new()
     {
-        public MSSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
+        public PGSQLInventoryHandler(string c, string t, string m) : base(c, t, m) {}
 
         protected bool IncrementFolderVersion(UUID folderID)
         {
@@ -275,18 +297,21 @@ namespace OpenSim.Data.MSSQL
 
         protected bool IncrementFolderVersion(string folderID)
         {
-//            m_log.DebugFormat("[MYSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
+//            m_log.DebugFormat("[PGSQL ITEM HANDLER]: Incrementing version on folder {0}", folderID);
 //            Util.PrintCallStack();
 
-            string sql = "update inventoryfolders set version=version+1 where folderID = ?folderID";
-            
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            string sql = @"update inventoryfolders set version=version+1 where ""folderID"" = :folderID";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             {
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
+                    UUID foldID = UUID.Zero;
+                    UUID.TryParse(folderID, out foldID);
+
                     conn.Open();
 
-                    cmd.Parameters.AddWithValue("@folderID", folderID);
+                    cmd.Parameters.Add( m_database.CreateParameter("folderID", foldID) );
 
                     try
                     {
@@ -302,4 +327,4 @@ namespace OpenSim.Data.MSSQL
             return true;
         }
     }
-}
\ No newline at end of file
+}