Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 111 insertions, 86 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index 1faa249..b5ca235 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -27,38 +27,44 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
 using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
+using System.Data;
+using Npgsql;
+using NpgsqlTypes;
 
-namespace OpenSim.Data.MSSQL
+namespace OpenSim.Data.PGSQL
 {
-    public class MSSQLEstateStore : IEstateDataStore
+    public class PGSQLEstateStore : IEstateDataStore
     {
         private const string _migrationStore = "EstateStore";
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private MSSQLManager _Database;
+        private PGSQLManager _Database;
         private string m_connectionString;
         private FieldInfo[] _Fields;
         private Dictionary<string, FieldInfo> _FieldMap = new Dictionary<string, FieldInfo>();
 
         #region Public methods
 
-        public MSSQLEstateStore()
+        public PGSQLEstateStore()
         {
         }
 
-        public MSSQLEstateStore(string connectionString)
+        public PGSQLEstateStore(string connectionString)
         {
             Initialise(connectionString);
         }
 
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+
         /// <summary>
         /// Initialises the estatedata class.
         /// </summary>
@@ -68,11 +74,11 @@ namespace OpenSim.Data.MSSQL
             if (!string.IsNullOrEmpty(connectionString))
             {
                 m_connectionString = connectionString;
-                _Database = new MSSQLManager(connectionString);
+                _Database = new PGSQLManager(connectionString);
             }
 
             //Migration settings
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
                 Migration m = new Migration(conn, GetType().Assembly, "EstateStore");
@@ -101,15 +107,17 @@ namespace OpenSim.Data.MSSQL
         {
             EstateSettings es = new EstateSettings();
 
-            string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = @RegionID";
+            string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) +
+                         "\" from estate_map left join estate_settings on estate_map.\"EstateID\" = estate_settings.\"EstateID\" " +
+                         " where estate_settings.\"EstateID\" is not null and \"RegionID\" = :RegionID";
 
             bool insertEstate = false;
-            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("@RegionID", regionID));
+                cmd.Parameters.Add(_Database.CreateParameter("RegionID", regionID));
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     if (reader.Read())
                     {
@@ -119,11 +127,15 @@ namespace OpenSim.Data.MSSQL
                             object v = reader[name];
                             if (f.FieldType == typeof(bool))
                             {
-                                f.SetValue(es, Convert.ToInt32(v) != 0);
+                                f.SetValue(es, v);
                             }
                             else if (f.FieldType == typeof(UUID))
                             {
-                                f.SetValue(es, new UUID((Guid)v)); // uuid);
+                                UUID estUUID = UUID.Zero;
+
+                                UUID.TryParse(v.ToString(), out estUUID);
+
+                                f.SetValue(es, estUUID);
                             }
                             else if (f.FieldType == typeof(string))
                             {
@@ -187,25 +199,37 @@ namespace OpenSim.Data.MSSQL
 
             names.Remove("EstateID");
 
-            string sql = string.Format("insert into estate_settings ({0}) values ( @{1})", String.Join(",", names.ToArray()), String.Join(", @", names.ToArray()));
+            string sql = string.Format("insert into estate_settings (\"{0}\") values ( :{1} )", String.Join("\",\"", names.ToArray()), String.Join(", :", names.ToArray()));
 
-            //_Log.Debug("[DB ESTATE]: SQL: " + sql);
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
-            using (SqlCommand insertCommand = new SqlCommand(sql, conn))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
+            using (NpgsqlCommand insertCommand = new NpgsqlCommand(sql, conn))
             {
-                insertCommand.CommandText = sql + " SET @ID = SCOPE_IDENTITY()";
+                insertCommand.CommandText = sql;
 
                 foreach (string name in names)
                 {
-                    insertCommand.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
+                    insertCommand.Parameters.Add(_Database.CreateParameter("" + name, _FieldMap[name].GetValue(es)));
                 }
-                SqlParameter idParameter = new SqlParameter("@ID", SqlDbType.Int);
-                idParameter.Direction = ParameterDirection.Output;
-                insertCommand.Parameters.Add(idParameter);
+                //NpgsqlParameter idParameter = new NpgsqlParameter("ID", SqlDbType.Int);
+                //idParameter.Direction = ParameterDirection.Output;
+                //insertCommand.Parameters.Add(idParameter);
                 conn.Open();
-                insertCommand.ExecuteNonQuery();
 
-                es.EstateID = Convert.ToUInt32(idParameter.Value);
+                es.EstateID = 100;
+
+                if (insertCommand.ExecuteNonQuery() > 0)
+                {
+                    insertCommand.CommandText = "Select cast(lastval() as int) as ID ;";
+
+                    using (NpgsqlDataReader result = insertCommand.ExecuteReader())
+                    {
+                        if (result.Read())
+                        {
+                            es.EstateID = (uint)result.GetInt32(0);
+                        }
+                    }
+                }
+
             }
 
             //TODO check if this is needed??
@@ -225,20 +249,20 @@ namespace OpenSim.Data.MSSQL
             string sql = string.Format("UPDATE estate_settings SET ");
             foreach (string name in names)
             {
-                sql += name + " = @" + name + ", ";
+                sql += "\"" + name + "\" = :" + name + ", ";
             }
             sql = sql.Remove(sql.LastIndexOf(","));
-            sql += " WHERE EstateID = @EstateID";
+            sql += " WHERE \"EstateID\" = :EstateID";
 
-            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))
             {
                 foreach (string name in names)
                 {
-                    cmd.Parameters.Add(_Database.CreateParameter("@" + name, _FieldMap[name].GetValue(es)));
+                    cmd.Parameters.Add(_Database.CreateParameter("" + name, _FieldMap[name].GetValue(es)));
                 }
 
-                cmd.Parameters.Add(_Database.CreateParameter("@EstateID", es.EstateID));
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", es.EstateID));
                 conn.Open();
                 cmd.ExecuteNonQuery();
             }
@@ -262,16 +286,16 @@ namespace OpenSim.Data.MSSQL
         {
             es.ClearBans();
 
-            string sql = "select bannedUUID from estateban where EstateID = @EstateID";
+            string sql = "select \"bannedUUID\" from estateban where \"EstateID\" = :EstateID";
 
-            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))
             {
-                SqlParameter idParameter = new SqlParameter("@EstateID", SqlDbType.Int);
+                NpgsqlParameter idParameter = new NpgsqlParameter("EstateID", DbType.Int32);
                 idParameter.Value = es.EstateID;
                 cmd.Parameters.Add(idParameter);
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
                     {
@@ -290,14 +314,14 @@ namespace OpenSim.Data.MSSQL
         {
             List<UUID> uuids = new List<UUID>();
 
-            string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
+            string sql = string.Format("select uuid from {0} where \"EstateID\" = :EstateID", table);
 
-            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("@EstateID", estateID));
+                cmd.Parameters.Add(_Database.CreateParameter("EstateID", estateID));
                 conn.Open();
-                using (SqlDataReader reader = cmd.ExecuteReader())
+                using (NpgsqlDataReader reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
                     {
@@ -312,21 +336,21 @@ namespace OpenSim.Data.MSSQL
         private void SaveBanList(EstateSettings es)
         {
             //Delete first
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                using (SqlCommand cmd = conn.CreateCommand())
+                using (NpgsqlCommand cmd = conn.CreateCommand())
                 {
-                    cmd.CommandText = "delete from estateban where EstateID = @EstateID";
-                    cmd.Parameters.AddWithValue("@EstateID", (int)es.EstateID);
+                    cmd.CommandText = "delete from estateban where \"EstateID\" = :EstateID";
+                    cmd.Parameters.AddWithValue("EstateID", (int)es.EstateID);
                     cmd.ExecuteNonQuery();
 
                     //Insert after
-                    cmd.CommandText = "insert into estateban (EstateID, bannedUUID,bannedIp, bannedIpHostMask, bannedNameMask) values ( @EstateID, @bannedUUID, '','','' )";
-                    cmd.Parameters.AddWithValue("@bannedUUID", Guid.Empty);
+                    cmd.CommandText = "insert into estateban (\"EstateID\", \"bannedUUID\",\"bannedIp\", \"bannedIpHostMask\", \"bannedNameMask\") values ( :EstateID, :bannedUUID, '','','' )";
+                    cmd.Parameters.AddWithValue("bannedUUID", Guid.Empty);
                     foreach (EstateBan b in es.EstateBans)
                     {
-                        cmd.Parameters["@bannedUUID"].Value = b.BannedUserID.Guid;
+                        cmd.Parameters["bannedUUID"].Value = b.BannedUserID.Guid;
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -335,20 +359,20 @@ namespace OpenSim.Data.MSSQL
 
         private void SaveUUIDList(uint estateID, string table, UUID[] data)
         {
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                using (SqlCommand cmd = conn.CreateCommand())
+                using (NpgsqlCommand cmd = conn.CreateCommand())
                 {
-                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
-                    cmd.CommandText = string.Format("delete from {0} where EstateID = @EstateID", table);
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
+                    cmd.CommandText = string.Format("delete from {0} where \"EstateID\" = :EstateID", table);
                     cmd.ExecuteNonQuery();
 
-                    cmd.CommandText = string.Format("insert into {0} (EstateID, uuid) values ( @EstateID, @uuid )", table);
-                    cmd.Parameters.AddWithValue("@uuid", Guid.Empty);
+                    cmd.CommandText = string.Format("insert into {0} (\"EstateID\", uuid) values ( :EstateID, :uuid )", table);
+                    cmd.Parameters.AddWithValue("uuid", Guid.Empty);
                     foreach (UUID uuid in data)
                     {
-                        cmd.Parameters["@uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
+                        cmd.Parameters["uuid"].Value = uuid.Guid; //.ToString(); //TODO check if this works
                         cmd.ExecuteNonQuery();
                     }
                 }
@@ -358,14 +382,14 @@ namespace OpenSim.Data.MSSQL
         public EstateSettings LoadEstateSettings(int estateID)
         {
             EstateSettings es = new EstateSettings();
-            string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) + " from estate_settings where EstateID = @EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) + "\" from estate_settings where \"EstateID\" = :EstateID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    cmd.Parameters.AddWithValue("@EstateID", (int)estateID);
-                    using (SqlDataReader reader = cmd.ExecuteReader())
+                    cmd.Parameters.AddWithValue("EstateID", (int)estateID);
+                    using (NpgsqlDataReader reader = cmd.ExecuteReader())
                     {
                         if (reader.Read())
                         {
@@ -428,13 +452,13 @@ namespace OpenSim.Data.MSSQL
         public List<int> GetEstates(string search)
         {
             List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings where EstateName = @EstateName";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            string sql = "select \"EstateID\" from estate_settings where lower(\"EstateName\") = lower(:EstateName)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    cmd.Parameters.AddWithValue("@EstateName", search);
+                    cmd.Parameters.AddWithValue("EstateName", search);
 
                     using (IDataReader reader = cmd.ExecuteReader())
                     {
@@ -453,11 +477,11 @@ namespace OpenSim.Data.MSSQL
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            string sql = "select \"EstateID\" from estate_settings";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
                     using (IDataReader reader = cmd.ExecuteReader())
                     {
@@ -476,13 +500,13 @@ namespace OpenSim.Data.MSSQL
         public List<int> GetEstatesByOwner(UUID ownerID)
         {
             List<int> result = new List<int>();
-            string sql = "select estateID from estate_settings where EstateOwner = @EstateOwner";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            string sql = "select \"EstateID\" from estate_settings where \"EstateOwner\" = :EstateOwner";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    cmd.Parameters.AddWithValue("@EstateOwner", ownerID);
+                    cmd.Parameters.AddWithValue("EstateOwner", ownerID);
 
                     using (IDataReader reader = cmd.ExecuteReader())
                     {
@@ -500,28 +524,29 @@ namespace OpenSim.Data.MSSQL
 
         public bool LinkRegion(UUID regionID, int estateID)
         {
-            string deleteSQL = "delete from estate_map where RegionID = @RegionID";
-            string insertSQL = "insert into estate_map values (@RegionID, @EstateID)";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            string deleteSQL = "delete from estate_map where \"RegionID\" = :RegionID";
+            string insertSQL = "insert into estate_map values (:RegionID, :EstateID)";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                SqlTransaction transaction = conn.BeginTransaction();
+
+                NpgsqlTransaction transaction = conn.BeginTransaction();
 
                 try
                 {
-                    using (SqlCommand cmd = new SqlCommand(deleteSQL, conn))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(deleteSQL, conn))
                     {
                         cmd.Transaction = transaction;
-                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
 
                         cmd.ExecuteNonQuery();
                     }
 
-                    using (SqlCommand cmd = new SqlCommand(insertSQL, conn))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(insertSQL, conn))
                     {
                         cmd.Transaction = transaction;
-                        cmd.Parameters.AddWithValue("@RegionID", regionID.Guid);
-                        cmd.Parameters.AddWithValue("@EstateID", estateID);
+                        cmd.Parameters.AddWithValue("RegionID", regionID.Guid);
+                        cmd.Parameters.AddWithValue("EstateID", estateID);
 
                         int ret = cmd.ExecuteNonQuery();
 
@@ -545,13 +570,13 @@ namespace OpenSim.Data.MSSQL
         public List<UUID> GetRegions(int estateID)
         {
             List<UUID> result = new List<UUID>();
-            string sql = "select RegionID from estate_map where EstateID = @EstateID";
-            using (SqlConnection conn = new SqlConnection(m_connectionString))
+            string sql = "select \"RegionID\" from estate_map where \"EstateID\" = :EstateID";
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
             {
                 conn.Open();
-                using (SqlCommand cmd = new SqlCommand(sql, conn))
+                using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
                 {
-                    cmd.Parameters.AddWithValue("@EstateID", estateID);
+                    cmd.Parameters.AddWithValue("EstateID", estateID);
 
                     using (IDataReader reader = cmd.ExecuteReader())
                     {