From 49df7876655c8d452decee97bf0ee437257e0c8e Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 27 Aug 2008 18:51:42 +0000
Subject: remove the legacy pre-Migration database upgrade paths
---
OpenSim/Data/MySQL/MySQLAssetData.cs | 42 ------------------------------------
1 file changed, 42 deletions(-)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index bdb1571..08a8c6e 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -78,10 +78,6 @@ namespace OpenSim.Data.MySQL
Assembly assem = GetType().Assembly;
Migration m = new Migration(_dbConnection.Connection, assem, "AssetStore");
- // TODO: After rev 6000, remove this. People should have
- // been rolled onto the new migration code by then.
- TestTables(m);
-
m.Update();
}
@@ -115,44 +111,6 @@ namespace OpenSim.Data.MySQL
#region IAssetProviderPlugin Members
/// <summary>
- /// <list type="bullet">
- /// <item>Execute CreateAssetsTable.sql if oldVersion == null</item>
- /// <item>do nothing if oldVersion != null</item>
- /// </list>
- /// </summary>
- /// <param name="oldVersion"></param>
- // private void UpgradeAssetsTable(string oldVersion)
- // {
- // // null as the version, indicates that the table didn't exist
- // if (oldVersion == null)
- // {
- // m_log.Info("[ASSETS DB]: Creating new database tables");
- // _dbConnection.ExecuteResourceSql("CreateAssetsTable.sql");
- // return;
- // }
- // }
-
- /// <summary>
- /// Ensure that the assets related tables exists and are at the latest version
- /// </summary>
- /// <param name="m"></param>
- private void TestTables(Migration m)
- {
- Dictionary<string, string> tableList = new Dictionary<string, string>();
-
- tableList["assets"] = null;
- _dbConnection.GetTableVersion(tableList);
-
- // if there is no table, return, migrations will handle it.
- if (tableList["assets"] == null)
- return;
-
- // if there is a table, and we don't have a migration, set it to 1
- if (m.Version == 0)
- m.Version = 1;
- }
-
- /// <summary>
/// Fetch Asset <paramref name="assetID"/> from database
/// </summary>
/// <param name="assetID">Asset UUID to fetch</param>
--
cgit v1.1