Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 39 insertions, 22 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
index fef6978..a841353 100644
--- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -31,18 +31,18 @@ using System.Collections.Generic;
 using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Text;
+using Npgsql;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLFriendsData : MSSQLGenericTableHandler<FriendsData>, IFriendsData
+    public class PGSQLFriendsData : PGSQLGenericTableHandler<FriendsData>, IFriendsData
     {
-        public MSSQLFriendsData(string connectionString, string realm)
+        public PGSQLFriendsData(string connectionString, string realm)
             : base(connectionString, realm, "FriendsStore")
         {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             {
                 conn.Open();
                 Migration m = new Migration(conn, GetType().Assembly, "FriendsStore");
@@ -50,19 +50,27 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        public bool Delete(UUID principalID, string friend)
+        
+        public override bool Delete(string principalID, string friend)
         {
-            return Delete(principalID.ToString(), friend);
+            UUID princUUID = UUID.Zero;
+
+            bool ret = UUID.TryParse(principalID, out princUUID);
+
+            if (ret)
+                return Delete(princUUID, friend);
+            else
+                return false;
         }
 
-        public bool Delete(string principalID, string friend)
+        public bool Delete(UUID principalID, string friend)
         {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where PrincipalID = @PrincipalID and Friend = @Friend", m_Realm);
-                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@Friend", friend));
+                cmd.CommandText = String.Format("delete from {0} where \"PrincipalID\" = :PrincipalID and \"Friend\" = :Friend", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("Friend", friend));
                 cmd.Connection = conn;
                 conn.Open();
                 cmd.ExecuteNonQuery();
@@ -71,19 +79,28 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        public FriendsData[] GetFriends(UUID principalID)
+        public FriendsData[] GetFriends(string principalID)
         {
-            return GetFriends(principalID.ToString());
+            UUID princUUID = UUID.Zero;
+
+            bool ret = UUID.TryParse(principalID, out princUUID);
+
+            if (ret)
+               return GetFriends(princUUID);
+            else
+                return new FriendsData[0];
         }
 
-        public FriendsData[] GetFriends(string principalID)
+        public FriendsData[] GetFriends(UUID principalID)
         {
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
 
-                cmd.CommandText = String.Format("select a.*,case when b.Flags is null then -1 else b.Flags end as TheirFlags from {0} as a left join {0} as b on a.PrincipalID = b.Friend and a.Friend = b.PrincipalID where a.PrincipalID = @PrincipalID", m_Realm);
-                cmd.Parameters.Add(m_database.CreateParameter("@PrincipalID", principalID.ToString()));
+                cmd.CommandText = String.Format("select a.*,case when b.\"Flags\" is null then '-1' else b.\"Flags\" end as \"TheirFlags\" from {0} as a " + 
+                                                " left join {0} as b on a.\"PrincipalID\" = b.\"Friend\" and a.\"Friend\" = b.\"PrincipalID\" " +
+                                                " where a.\"PrincipalID\" = :PrincipalID", m_Realm);
+                cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID.ToString()));
                 cmd.Connection = conn;
                 conn.Open();
                 return DoQuery(cmd);
@@ -92,7 +109,7 @@ namespace OpenSim.Data.MSSQL
 
         public FriendsData[] GetFriends(Guid principalID)
         {
-            return GetFriends(principalID.ToString());
+            return GetFriends(principalID);
         }
  
     }