From 23d478f2fa06d1dedabfb24cf6ff763b586173ce Mon Sep 17 00:00:00 2001
From: Kunnis
Date: Sun, 9 Aug 2009 02:01:21 -0500
Subject: Adding in Reflection-based testing, to ensure that all properties are
 covered.

---
 OpenSim/Data/MySQL/MySQLInventoryData.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Data/MySQL/MySQLInventoryData.cs')

diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index a4b8663..121ef7a 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Data.MySQL
                 item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"];
                 item.GroupPermissions = (uint) reader["inventoryGroupPermissions"];
                 item.SalePrice = (int) reader["salePrice"];
-                item.SaleType = Convert.ToByte(reader["saleType"]);
+                item.SaleType = unchecked((byte)(Convert.ToSByte(reader["saleType"])));
                 item.CreationDate = (int) reader["creationDate"];
                 item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
                 item.Flags = (uint) reader["flags"];
@@ -423,7 +423,7 @@ namespace OpenSim.Data.MySQL
         /// <summary>
         /// Returns a specified inventory folder
         /// </summary>
-        /// <param name="folder">The folder to return</param>
+        /// <param name="folderID">The folder to return</param>
         /// <returns>A folder class</returns>
         public InventoryFolderBase getInventoryFolder(UUID folderID)
         {
@@ -438,8 +438,9 @@ namespace OpenSim.Data.MySQL
                     result.Parameters.AddWithValue("?uuid", folderID.ToString());
                     MySqlDataReader reader = result.ExecuteReader();
 
-                    reader.Read();
-                    InventoryFolderBase folder = readInventoryFolder(reader);
+                    InventoryFolderBase folder = null;
+                    if(reader.Read())
+                         folder = readInventoryFolder(reader);
                     reader.Close();
                     result.Dispose();
 
@@ -506,7 +507,7 @@ namespace OpenSim.Data.MySQL
                 result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
                 result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
                 result.Parameters.AddWithValue("?salePrice", item.SalePrice);
-                result.Parameters.AddWithValue("?saleType", item.SaleType);
+                result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
                 result.Parameters.AddWithValue("?creationDate", item.CreationDate);
                 result.Parameters.AddWithValue("?groupID", item.GroupID);
                 result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
-- 
cgit v1.1


From d2e5380cb2325ad42917c528c52a8ad42ec0176f Mon Sep 17 00:00:00 2001
From: Kunnis
Date: Sat, 15 Aug 2009 10:54:48 -0500
Subject: * Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an
 extra parameter from MySQL/MySQLInventoryData.cs * Fixed a bug in
 SQLite/SQLiteAssetData.cs that was causing a NRE when updating an asset. *
 Improved the BasicAssetTest.cs to do full create/update/get testing *
 Improved the BasicInventoryTest.cs to do full create/update/get of both a
 folder and an item * Moved the null ref tests to the start of the
 PropertyCompareConstraint.cs, so that it doesn't throw when passing in a null
 item

---
 OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL/MySQLInventoryData.cs')

diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 121ef7a..849c246 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -604,7 +604,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
             cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
             cmd.Parameters.AddWithValue("?folderName", folderName);
-            cmd.Parameters.AddWithValue("?type", (short) folder.Type);
+            cmd.Parameters.AddWithValue("?type", folder.Type);
             cmd.Parameters.AddWithValue("?version", folder.Version);
 
             try
-- 
cgit v1.1


From 82c888fc6c103ec345bf656cd469f4260b678bcb Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 17 Aug 2009 10:29:06 +0900
Subject: Add copyright headers. Formatting cleanup. Fix a compiler warning.

---
 OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Data/MySQL/MySQLInventoryData.cs')

diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 849c246..4521a0f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -439,7 +439,7 @@ namespace OpenSim.Data.MySQL
                     MySqlDataReader reader = result.ExecuteReader();
 
                     InventoryFolderBase folder = null;
-                    if(reader.Read())
+                    if (reader.Read())
                          folder = readInventoryFolder(reader);
                     reader.Close();
                     result.Dispose();
-- 
cgit v1.1