From dbcd6112b9e23f45638089a528102617af57b4fc Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 30 Apr 2008 17:11:59 +0000 Subject: [PATCH] * Actually enable the inventory upgrade sql if appropriate --- OpenSim/Data/MySQL/MySQLInventoryData.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index 2c781e0f6e..944c2f5da1 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs @@ -101,10 +101,11 @@ namespace OpenSim.Data.MySQL } // if the table is already at the current version, then we can exit immediately -// if (oldVersion == "Rev. 2") -// return; - -// database.ExecuteResourceSql("UpgradeItemsTableToVersion2.sql"); + if (oldVersion.StartsWith("Rev. 2;")) + { + m_log.Info("[INVENTORY DB]: Upgrading inventory items table from Rev. 2 to Rev. 3"); + database.ExecuteResourceSql("UpgradeItemsTableToVersion3.sql"); + } } private void TestTables(MySqlConnection conn) @@ -115,8 +116,8 @@ namespace OpenSim.Data.MySQL tableList["inventoryitems"] = null; database.GetTableVersion(tableList); - m_log.Info("[MYSQL]: Inventory Folder Version: " + tableList["inventoryfolders"]); - m_log.Info("[MYSQL]: Inventory Items Version: " + tableList["inventoryitems"]); + m_log.Info("[INVENTORY DB]: Inventory Folder Version: " + tableList["inventoryfolders"]); + m_log.Info("[INVENTORY DB]: Inventory Items Version: " + tableList["inventoryitems"]); UpgradeFoldersTable(tableList["inventoryfolders"]); UpgradeItemsTable(tableList["inventoryitems"]);