From 8d23d97084394202f46a377ff4e1a5d160c21c98 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 18 Feb 2009 12:56:28 +0000
Subject: remove legacy pre-migration code for mysql grid adapter, who knew
this was still in there.
---
OpenSim/Data/MySQL/MySQLGridData.cs | 55 -------------------------------------
1 file changed, 55 deletions(-)
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 5c00330..75901b2 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -148,64 +148,9 @@ namespace OpenSim.Data.MySQL
// This actually does the roll forward assembly stuff
Assembly assem = GetType().Assembly;
Migration m = new Migration(database.Connection, assem, "GridStore");
-
- // TODO: After rev 6000, remove this. People should have
- // been rolled onto the new migration code by then.
- TestTables(m);
-
m.Update();
}
- #region Test and initialization code
-
- ///
- /// Ensure that the user related tables exists and are at the latest version
- ///
- private void TestTables(Migration m)
- {
- // we already have migrations, get out of here
- if (m.Version > 0)
- return;
-
- Dictionary tableList = new Dictionary();
-
- tableList["regions"] = null;
- database.GetTableVersion(tableList);
-
- UpgradeRegionsTable(tableList["regions"]);
-
- // we have tables, but not a migration model yet
- if (m.Version == 0)
- m.Version = 1;
- }
-
- ///
- /// Create or upgrade the table if necessary
- ///
- /// A null indicates that the table does not
- /// currently exist
- private void UpgradeRegionsTable(string oldVersion)
- {
- // null as the version, indicates that the table didn't exist
- if (oldVersion == null)
- {
- database.ExecuteResourceSql("CreateRegionsTable.sql");
- return;
- }
- if (oldVersion.Contains("Rev. 1"))
- {
- database.ExecuteResourceSql("UpgradeRegionsTableToVersion2.sql");
- return;
- }
- if (oldVersion.Contains("Rev. 2"))
- {
- database.ExecuteResourceSql("UpgradeRegionsTableToVersion3.sql");
- return;
- }
- }
-
- #endregion
-
///
/// Shuts down the grid interface
///
--
cgit v1.1