OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

actually create and populate the migrations table correctly.

0.6.0-stable
Sean Dague 2008-06-09 22:20:28 +00:00
parent 69fb4ee208
commit c62f081380
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Data/Migration.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Data
/// When a database driver starts up, it specifies a resource that /// When a database driver starts up, it specifies a resource that
/// needs to be brought up to the current revision. For instance: /// needs to be brought up to the current revision. For instance:
/// ///
/// Migration um = new Migration(DbConnection, "Users"); /// Migration um = new Migration(Assembly, DbConnection, "Users");
/// um.Upgrade(); /// um.Upgrade();
/// ///
/// This works out which version Users is at, and applies all the /// This works out which version Users is at, and applies all the
@ -62,6 +62,10 @@ namespace OpenSim.Data
/// migration to be an incremental roll forward of the tables in /// migration to be an incremental roll forward of the tables in
/// question. /// question.
/// ///
/// Assembly must be specifically passed in because otherwise you
/// get the assembly that Migration.cs is part of, and what you
/// really want is the assembly of your database class.
///
/// </summary> /// </summary>
public class Migration public class Migration
@ -99,7 +103,7 @@ namespace OpenSim.Data
cmd.CommandText = _migrations_create; cmd.CommandText = _migrations_create;
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
UpdateVersion("migrations", 1); InsertVersion("migrations", 1);
} }
public void Update() public void Update()
@ -117,9 +121,14 @@ namespace OpenSim.Data
} }
newversion = MaxVersion(); newversion = MaxVersion();
if (newversion > version) if (newversion > version) {
if (version == 0) {
InsertVersion(_type, newversion);
} else {
UpdateVersion(_type, newversion); UpdateVersion(_type, newversion);
} }
}
}
private int MaxVersion() private int MaxVersion()
{ {
@ -127,7 +136,7 @@ namespace OpenSim.Data
string[] names = _assem.GetManifestResourceNames(); string[] names = _assem.GetManifestResourceNames();
List<string> migrations = new List<string>(); List<string> migrations = new List<string>();
Regex r = new Regex(@"^(\d\d\d)_" + _type + @"\.sql"); Regex r = new Regex(@"\.(\d\d\d)_" + _type + @"\.sql");
foreach (string s in names) foreach (string s in names)
{ {
@ -162,10 +171,19 @@ namespace OpenSim.Data
return version; return version;
} }
private void InsertVersion(string type, int version)
{
DbCommand cmd = _conn.CreateCommand();
cmd.CommandText = "insert into migrations(name, version) values('" + type + "', " + version + ")";
m_log.InfoFormat("Creating {0} at version {1}", type, version);
cmd.ExecuteNonQuery();
}
private void UpdateVersion(string type, int version) private void UpdateVersion(string type, int version)
{ {
DbCommand cmd = _conn.CreateCommand(); DbCommand cmd = _conn.CreateCommand();
cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'"; cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'";
m_log.InfoFormat("Updating {0} to version {1}", type, version);
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
@ -182,11 +200,10 @@ namespace OpenSim.Data
Regex r = new Regex(@"^(\d\d\d)_" + _type + @"\.sql"); Regex r = new Regex(@"^(\d\d\d)_" + _type + @"\.sql");
foreach (string s in names) foreach (string s in names)
{
m_log.Info("MIGRATION: Resources: " + s);
if (s.EndsWith(_type + @"\.sql"))
{ {
Match m = r.Match(s); Match m = r.Match(s);
if (m.Success)
{
m_log.Info("MIGRATION: Match: " + m.Groups[1].ToString()); m_log.Info("MIGRATION: Match: " + m.Groups[1].ToString());
int MigrationVersion = int.Parse(m.Groups[1].ToString()); int MigrationVersion = int.Parse(m.Groups[1].ToString());
using (Stream resource = _assem.GetManifestResourceStream(s)) using (Stream resource = _assem.GetManifestResourceStream(s))