Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 73 insertions, 46 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
index 1ae78c4..d174112 100644
--- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLAuthenticationData.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -28,32 +28,38 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Data;
 using OpenMetaverse;
 using OpenSim.Framework;
-using System.Data.SqlClient;
 using System.Reflection;
 using System.Text;
+using System.Data;
+using Npgsql;
+using NpgsqlTypes;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLAuthenticationData : IAuthenticationData
+    public class PGSQLAuthenticationData : IAuthenticationData
     {
         private string m_Realm;
         private List<string> m_ColumnNames = null;
         private int m_LastExpire = 0;
         private string m_ConnectionString;
-        private MSSQLManager m_database;
+        private PGSQLManager m_database;
+
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
 
-        public MSSQLAuthenticationData(string connectionString, string realm)
+        public PGSQLAuthenticationData(string connectionString, string realm)
         {
             m_Realm = realm;
             m_ConnectionString = connectionString;
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
             {
                 conn.Open();
                 Migration m = new Migration(conn, GetType().Assembly, "AuthStore");
-                m_database = new MSSQLManager(m_ConnectionString);
+                m_database = new PGSQLManager(m_ConnectionString);
                 m.Update();
             }
         }
@@ -63,14 +69,14 @@ namespace OpenSim.Data.MSSQL
             AuthenticationData ret = new AuthenticationData();
             ret.Data = new Dictionary<string, object>();
 
-            string sql = string.Format("select * from {0} where UUID = @principalID", m_Realm);
+            string sql = string.Format("select * from {0} where uuid = :principalID", m_Realm);
 
-            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(m_database.CreateParameter("@principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
                 conn.Open();
-                using (SqlDataReader result = cmd.ExecuteReader())
+                using (NpgsqlDataReader result = cmd.ExecuteReader())
                 {
                     if (result.Read())
                     {
@@ -87,7 +93,7 @@ namespace OpenSim.Data.MSSQL
 
                         foreach (string s in m_ColumnNames)
                         {
-                            if (s == "UUID")
+                            if (s == "UUID"||s == "uuid")
                                 continue;
 
                             ret.Data[s] = result[s].ToString();
@@ -103,12 +109,31 @@ namespace OpenSim.Data.MSSQL
         {
             if (data.Data.ContainsKey("UUID"))
                 data.Data.Remove("UUID");
+            if (data.Data.ContainsKey("uuid"))
+                data.Data.Remove("uuid");
+
+            /*
+            Dictionary<string, object> oAuth = new Dictionary<string, object>();
 
+            foreach (KeyValuePair<string, object> oDado in data.Data)
+            {
+                if (oDado.Key != oDado.Key.ToLower())
+                {
+                    oAuth.Add(oDado.Key.ToLower(), oDado.Value);
+                }
+            }
+            foreach (KeyValuePair<string, object> oDado in data.Data)
+            {
+                if (!oAuth.ContainsKey(oDado.Key.ToLower())) {
+                    oAuth.Add(oDado.Key.ToLower(), oDado.Value);
+                }
+            }
+            */
             string[] fields = new List<string>(data.Data.Keys).ToArray();
             StringBuilder updateBuilder = new StringBuilder();
-           
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand())
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
             {
                 updateBuilder.AppendFormat("update {0} set ", m_Realm);
 
@@ -117,27 +142,28 @@ namespace OpenSim.Data.MSSQL
                 {
                     if (!first)
                         updateBuilder.Append(", ");
-                    updateBuilder.AppendFormat("{0} = @{0}",field);
+                    updateBuilder.AppendFormat("\"{0}\" = :{0}",field);
 
                     first = false;
-                    cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field]));
+                    
+                    cmd.Parameters.Add(m_database.CreateParameter("" + field, data.Data[field]));
                 }
 
-                updateBuilder.Append(" where UUID = @principalID");
+                updateBuilder.Append(" where uuid = :principalID");
 
                 cmd.CommandText = updateBuilder.ToString();
                 cmd.Connection = conn;
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", data.PrincipalID));
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", data.PrincipalID));
                 
                 conn.Open();
                 if (cmd.ExecuteNonQuery() < 1)
                 {
                     StringBuilder insertBuilder = new StringBuilder();
 
-                    insertBuilder.AppendFormat("insert into {0} (UUID, ", m_Realm);
-                    insertBuilder.Append(String.Join(", ", fields));
-                    insertBuilder.Append(") values (@principalID, @");
-                    insertBuilder.Append(String.Join(", @", fields));
+                    insertBuilder.AppendFormat("insert into {0} (uuid, \"", m_Realm);
+                    insertBuilder.Append(String.Join("\", \"", fields));
+                    insertBuilder.Append("\") values (:principalID, :");
+                    insertBuilder.Append(String.Join(", :", fields));
                     insertBuilder.Append(")");
 
                     cmd.CommandText = insertBuilder.ToString();
@@ -153,11 +179,11 @@ namespace OpenSim.Data.MSSQL
 
         public bool SetDataItem(UUID principalID, string item, string value)
         {
-            string sql = string.Format("update {0} set {1} = @{1} where UUID = @UUID", m_Realm, item);
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = string.Format("update {0} set {1} = :{1} where uuid = :UUID", m_Realm, item);
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("@" + item, value));
+                cmd.Parameters.Add(m_database.CreateParameter("" + item, value));
                 conn.Open();
                 if (cmd.ExecuteNonQuery() > 0)
                     return true;
@@ -170,13 +196,13 @@ namespace OpenSim.Data.MSSQL
             if (System.Environment.TickCount - m_LastExpire > 30000)
                 DoExpire();
             
-            string sql = "insert into tokens (UUID, token, validity) values (@principalID, @token, @lifetime)";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = "insert into tokens (uuid, token, validity) values (:principalID, :token, :lifetime)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@lifetime", DateTime.Now.AddMinutes(lifetime)));
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("lifetime", DateTime.Now.AddMinutes(lifetime)));
                 conn.Open();
 
                 if (cmd.ExecuteNonQuery() > 0)
@@ -193,13 +219,14 @@ namespace OpenSim.Data.MSSQL
                 DoExpire();
 
             DateTime validDate = DateTime.Now.AddMinutes(lifetime);
-            string sql = "update tokens set validity = @validDate where UUID = @principalID and token = @token and validity > GetDate()";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = "update tokens set validity = :validDate where uuid = :principalID and token = :token and validity > (CURRENT_DATE + CURRENT_TIME)";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
-                cmd.Parameters.Add(m_database.CreateParameter("@principalID", principalID));
-                cmd.Parameters.Add(m_database.CreateParameter("@token", token));
-                cmd.Parameters.Add(m_database.CreateParameter("@validDate", validDate));
+                cmd.Parameters.Add(m_database.CreateParameter("principalID", principalID));
+                cmd.Parameters.Add(m_database.CreateParameter("token", token));
+                cmd.Parameters.Add(m_database.CreateParameter("validDate", validDate));
                 conn.Open();
 
                 if (cmd.ExecuteNonQuery() > 0)
@@ -213,12 +240,12 @@ namespace OpenSim.Data.MSSQL
         private void DoExpire()
         {
             DateTime currentDateTime = DateTime.Now;
-            string sql = "delete from tokens where validity < @currentDateTime";
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
+            string sql = "delete from tokens where validity < :currentDateTime";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
             {
                 conn.Open();
-                cmd.Parameters.Add(m_database.CreateParameter("@currentDateTime", currentDateTime));
+                cmd.Parameters.Add(m_database.CreateParameter("currentDateTime", currentDateTime));
                 cmd.ExecuteNonQuery();
             }
             m_LastExpire = System.Environment.TickCount;