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/MySQLAssetData.cs     | 9 +--------
 OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 5d87649..0865083 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -196,18 +196,11 @@ namespace OpenSim.Data.MySQL
         {
             lock (_dbConnection)
             {
-                //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID);
-                if (ExistsAsset(asset.FullID))
-                {
-                    //m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
-                    return;
-                }
-
                 _dbConnection.CheckConnection();
 
                 MySqlCommand cmd =
                     new MySqlCommand(
-                        "insert INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, data)" +
+                        "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, data)" +
                         "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?data)",
                         _dbConnection.Connection);
 
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