* Fixed MySQL Grid Manager

* Added preliminary support for DB UserServer (incomplete)
* Added better handling of defaults to Grid Manager.
* Renamed SQL/regions.sql to SQL/mysql-regions.sql.

1 files changed, 62 insertions, 47 deletions

diff --git a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index d3bfa18..7461b14 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
@@ -29,7 +29,7 @@ namespace OpenGrid.Framework.Data.MySQL
         {

             try

             {

-                string connectionString = "Server=" + hostname + ";Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";

+                string connectionString = "Server=" + hostname + ";Port=13306;Database=" + database + ";User ID=" + username + ";Password=" + password + ";Pooling=" + cpooling + ";";

                 dbcon = new MySqlConnection(connectionString);

 

                 dbcon.Open();

@@ -57,24 +57,32 @@ namespace OpenGrid.Framework.Data.MySQL
         /// <returns>A MySQL DB Command</returns>

         public IDbCommand Query(string sql, Dictionary<string, string> parameters)

         {

-            MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();

-            dbcommand.CommandText = sql;

-            foreach (KeyValuePair<string, string> param in parameters)

+            try

             {

-                dbcommand.Parameters.Add(param.Key, param.Value);

+                MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();

+                dbcommand.CommandText = sql;

+                foreach (KeyValuePair<string, string> param in parameters)

+                {

+                    dbcommand.Parameters.Add(param.Key, param.Value);

+                }

+

+                return (IDbCommand)dbcommand;

+            }

+            catch (Exception e)

+            {

+                Console.WriteLine("Failed during Query generation: " + e.ToString());

+                return null;

             }

-

-            return (IDbCommand)dbcommand;

         }

 

-        public SimProfileData getRow(IDataReader reader)

+        public SimProfileData getSimRow(IDataReader reader)

         {

             SimProfileData retval = new SimProfileData();

 

             if (reader.Read())

             {

                 // Region Main

-                retval.regionHandle = (ulong)reader["regionHandle"];

+                retval.regionHandle = Convert.ToUInt64(reader["regionHandle"].ToString());

                 retval.regionName = (string)reader["regionName"];

                 retval.UUID = new libsecondlife.LLUUID((string)reader["uuid"]);

 

@@ -91,15 +99,15 @@ namespace OpenGrid.Framework.Data.MySQL
                 retval.serverURI = (string)reader["serverURI"];

 

                 // Location

-                retval.regionLocX = (uint)((int)reader["locX"]);

-                retval.regionLocY = (uint)((int)reader["locY"]);

-                retval.regionLocZ = (uint)((int)reader["locZ"]);

+                retval.regionLocX = Convert.ToUInt32(reader["locX"].ToString());

+                retval.regionLocY = Convert.ToUInt32(reader["locY"].ToString());

+                retval.regionLocZ = Convert.ToUInt32(reader["locZ"].ToString());

 

                 // Neighbours - 0 = No Override

-                retval.regionEastOverrideHandle = (ulong)reader["eastOverrideHandle"];

-                retval.regionWestOverrideHandle = (ulong)reader["westOverrideHandle"];

-                retval.regionSouthOverrideHandle = (ulong)reader["southOverrideHandle"];

-                retval.regionNorthOverrideHandle = (ulong)reader["northOverrideHandle"];

+                retval.regionEastOverrideHandle = Convert.ToUInt64(reader["eastOverrideHandle"].ToString());

+                retval.regionWestOverrideHandle = Convert.ToUInt64(reader["westOverrideHandle"].ToString());

+                retval.regionSouthOverrideHandle = Convert.ToUInt64(reader["southOverrideHandle"].ToString());

+                retval.regionNorthOverrideHandle = Convert.ToUInt64(reader["northOverrideHandle"].ToString());

 

                 // Assets

                 retval.regionAssetURI = (string)reader["regionAssetURI"];

@@ -113,51 +121,57 @@ namespace OpenGrid.Framework.Data.MySQL
             }

             else

             {

-                throw new Exception("No rows to return");

+                throw new Exception("Unable to find region at coordinates");

+                return null;

             }

             return retval;

         }

 

-        public bool insertRow(SimProfileData profile) {

-            string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";

+        public bool insertRow(SimProfileData profile)

+        {

+            string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";

             sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";

             sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey) VALUES ";

 

-            sql += "(@regionHandle, @regionName, @uuid, @regionRecvKey, @regionSecret, @regionSendKey, @regionDataURI, ";

-            sql += "@serverIP, @serverPort, @serverURI, @locX, @locY, @locZ, @eastOverrideHandle, @westOverrideHandle, @southOverrideHandle, @northOverrideHandle, @regionAssetURI, @regionAssetRecvKey, ";

-            sql += "@regionAssetSendKey, @regionUserURI, @regionUserRecvKey, @regionUserSendKey);";

-

-            Dictionary<string, string> parameters = new Dictionary<string,string>();

-

-            parameters["regionHandle"] = profile.regionHandle.ToString();

-            parameters["regionName"] = profile.regionName;

-            parameters["uuid"] = profile.UUID.ToString();

-            parameters["regionRecvKey"] = profile.regionRecvKey;

-            parameters["regionSendKey"] = profile.regionSendKey;

-            parameters["regionDataURI"] = profile.regionDataURI;

-            parameters["serverIP"] = profile.serverIP;

-            parameters["serverPort"] = profile.serverPort.ToString();

-            parameters["serverURI"] = profile.serverURI;

-            parameters["locX"] = profile.regionLocX.ToString();

-            parameters["locY"] = profile.regionLocY.ToString();

-            parameters["locZ"] = profile.regionLocZ.ToString();

-            parameters["eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString();

-            parameters["westOverrideHandle"] = profile.regionWestOverrideHandle.ToString();

-            parameters["northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString();

-            parameters["southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString();

-            parameters["regionAssetURI"] = profile.regionAssetURI;

-            parameters["regionAssetRecvKey"] = profile.regionAssetRecvKey;

-            parameters["regionAssetSendKey"] = profile.regionAssetSendKey;

-            parameters["regionUserURI"] = profile.regionUserURI;

-            parameters["regionUserRecvKey"] = profile.regionUserRecvKey;

-            parameters["regionUserSendKey"] = profile.regionUserSendKey;

+            sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";

+            sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";

+            sql += "?regionAssetSendKey, ?regionUserURI, ?regionUserRecvKey, ?regionUserSendKey);";

+

+            Dictionary<string, string> parameters = new Dictionary<string, string>();

+

+            parameters["?regionHandle"] = profile.regionHandle.ToString();

+            parameters["?regionName"] = profile.regionName.ToString();

+            parameters["?uuid"] = profile.UUID.ToStringHyphenated();

+            parameters["?regionRecvKey"] = profile.regionRecvKey.ToString();

+            parameters["?regionSecret"] = profile.regionSecret.ToString();

+            parameters["?regionSendKey"] = profile.regionSendKey.ToString();

+            parameters["?regionDataURI"] = profile.regionDataURI.ToString();

+            parameters["?serverIP"] = profile.serverIP.ToString();

+            parameters["?serverPort"] = profile.serverPort.ToString();

+            parameters["?serverURI"] = profile.serverURI.ToString();

+            parameters["?locX"] = profile.regionLocX.ToString();

+            parameters["?locY"] = profile.regionLocY.ToString();

+            parameters["?locZ"] = profile.regionLocZ.ToString();

+            parameters["?eastOverrideHandle"] = profile.regionEastOverrideHandle.ToString();

+            parameters["?westOverrideHandle"] = profile.regionWestOverrideHandle.ToString();

+            parameters["?northOverrideHandle"] = profile.regionNorthOverrideHandle.ToString();

+            parameters["?southOverrideHandle"] = profile.regionSouthOverrideHandle.ToString();

+            parameters["?regionAssetURI"] = profile.regionAssetURI.ToString();

+            parameters["?regionAssetRecvKey"] = profile.regionAssetRecvKey.ToString();

+            parameters["?regionAssetSendKey"] = profile.regionAssetSendKey.ToString();

+            parameters["?regionUserURI"] = profile.regionUserURI.ToString();

+            parameters["?regionUserRecvKey"] = profile.regionUserRecvKey.ToString();

+            parameters["?regionUserSendKey"] = profile.regionUserSendKey.ToString();

 

             bool returnval = false;

 

             try

             {

+                

                 IDbCommand result = Query(sql, parameters);

 

+                //Console.WriteLine(result.CommandText);

+

                 if (result.ExecuteNonQuery() == 1)

                     returnval = true;

 

@@ -165,6 +179,7 @@ namespace OpenGrid.Framework.Data.MySQL
             }

             catch (Exception e)

             {

+                Console.WriteLine(e.ToString());

                 return false;

             }