1 files changed, 19 insertions, 20 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
index 0c71e79..0376585 100644..100755
--- a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLPresenceData.cs
@@ -33,27 +33,26 @@ using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
+using Npgsql;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
     /// <summary>
-    /// A MySQL Interface for the Presence Server
+    /// A PGSQL Interface for the Presence Server
     /// </summary>
-    public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>,
+    public class PGSQLPresenceData : PGSQLGenericTableHandler<PresenceData>,
             IPresenceData
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public MSSQLPresenceData(string connectionString, string realm) :
+        public PGSQLPresenceData(string connectionString, string realm) :
                 base(connectionString, realm, "Presence")
         {
         }
 
         public PresenceData Get(UUID sessionID)
         {
-            PresenceData[] ret = Get("SessionID",
-                    sessionID.ToString());
+            PresenceData[] ret = Get("SessionID", sessionID.ToString());
 
             if (ret.Length == 0)
                 return null;
@@ -63,13 +62,13 @@ namespace OpenSim.Data.MSSQL
 
         public void LogoutRegionAgents(UUID regionID)
         {
-            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 [RegionID]=@RegionID", m_Realm);
+                cmd.CommandText = String.Format("DELETE FROM {0} WHERE \"RegionID\" = :regionID", m_Realm);
 
-                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID));
                 cmd.Connection = conn;
                 conn.Open();
                 cmd.ExecuteNonQuery();
@@ -81,17 +80,18 @@ namespace OpenSim.Data.MSSQL
             PresenceData[] pd = Get("SessionID", sessionID.ToString());
             if (pd.Length == 0)
                 return false;
+                
+            if (regionID == UUID.Zero)
+                return false;
 
-            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(@"UPDATE {0} SET 
-                                                [RegionID] = @RegionID
-                                        WHERE [SessionID] = @SessionID", m_Realm);
+                cmd.CommandText = String.Format("UPDATE {0} SET \"RegionID\" = :regionID, \"LastSeen\" = now() WHERE \"SessionID\" = :sessionID", m_Realm);
 
-                cmd.Parameters.Add(m_database.CreateParameter("@SessionID", sessionID.ToString()));
-                cmd.Parameters.Add(m_database.CreateParameter("@RegionID", regionID.ToString()));
+                cmd.Parameters.Add(m_database.CreateParameter("SessionID", sessionID));
+                cmd.Parameters.Add(m_database.CreateParameter("RegionID", regionID));
                 cmd.Connection = conn;
                 conn.Open();
                 if (cmd.ExecuteNonQuery() == 0)
@@ -102,8 +102,7 @@ namespace OpenSim.Data.MSSQL
 
         public bool VerifyAgent(UUID agentId, UUID secureSessionID)
         {
-            PresenceData[] ret = Get("SecureSessionID",
-                    secureSessionID.ToString());
+            PresenceData[] ret = Get("SecureSessionID", secureSessionID.ToString());
             
             if (ret.Length == 0)
                 return false;