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

migrations seem to not break anything at this point. 

Tomorrow I'll start trying to integrate them into sqlite
to see if this works right for table migration.
0.6.0-stable
Sean Dague 2008-06-09 22:01:21 +00:00
parent 504ab4477d
commit 69fb4ee208
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenSim/Data/Migration.cs
View File

@ -82,6 +82,8 @@ namespace OpenSim.Data
_type = type; _type = type;
_conn = conn; _conn = conn;
_assem = assem; _assem = assem;
Initialize();
} }
private void Initialize() private void Initialize()
@ -103,6 +105,7 @@ namespace OpenSim.Data
public void Update() public void Update()
{ {
int version = 0; int version = 0;
int newversion = 0;
version = FindVersion(_type); version = FindVersion(_type);
List<string> migrations = GetMigrationsAfter(version); List<string> migrations = GetMigrationsAfter(version);
@ -112,7 +115,10 @@ namespace OpenSim.Data
cmd.CommandText = m; cmd.CommandText = m;
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
UpdateVersion(_type, MaxVersion());
newversion = MaxVersion();
if (newversion > version)
UpdateVersion(_type, newversion);
} }
private int MaxVersion() private int MaxVersion()
@ -126,9 +132,12 @@ namespace OpenSim.Data
foreach (string s in names) foreach (string s in names)
{ {
Match m = r.Match(s); Match m = r.Match(s);
int MigrationVersion = int.Parse(m.Groups[1].ToString()); if (m.Success)
if ( MigrationVersion > max ) {
max = MigrationVersion; int MigrationVersion = int.Parse(m.Groups[1].ToString());
if ( MigrationVersion > max )
max = MigrationVersion;
}
} }
return max; return max;
} }
@ -137,14 +146,18 @@ namespace OpenSim.Data
{ {
int version = 0; int version = 0;
DbCommand cmd = _conn.CreateCommand(); DbCommand cmd = _conn.CreateCommand();
cmd.CommandText = "select version from migrations where name='" + type + "' limit 1"; try {
using (IDataReader reader = cmd.ExecuteReader()) cmd.CommandText = "select version from migrations where name='" + type + "' limit 1";
{ using (IDataReader reader = cmd.ExecuteReader())
if (reader.Read())
{ {
version = Convert.ToInt32(reader["version"]); if (reader.Read())
{
version = Convert.ToInt32(reader["version"]);
}
reader.Close();
} }
reader.Close(); } catch {
// Something went wrong, so we're version 0
} }
return version; return version;
} }
@ -189,9 +202,8 @@ namespace OpenSim.Data
// TODO: once this is working, get rid of this // TODO: once this is working, get rid of this
if (migrations.Count < 1) { if (migrations.Count < 1) {
throw new Exception(string.Format("Resource '{0}' was not found", _type)); m_log.InfoFormat("Resource '{0}' was not found", _type);
} }
return migrations; return migrations;
} }
} }