diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/Migration.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index 45b44b9..30cd3b6 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
@@ -201,7 +201,7 @@ namespace OpenSim.Data | |||
201 | { | 201 | { |
202 | DbCommand cmd = _conn.CreateCommand(); | 202 | DbCommand cmd = _conn.CreateCommand(); |
203 | cmd.CommandText = "insert into migrations(name, version) values('" + type + "', " + version + ")"; | 203 | cmd.CommandText = "insert into migrations(name, version) values('" + type + "', " + version + ")"; |
204 | m_log.InfoFormat("Creating {0} at version {1}", type, version); | 204 | m_log.InfoFormat("[MIGRATIONS] Creating {0} at version {1}", type, version); |
205 | cmd.ExecuteNonQuery(); | 205 | cmd.ExecuteNonQuery(); |
206 | } | 206 | } |
207 | 207 | ||
@@ -209,7 +209,7 @@ namespace OpenSim.Data | |||
209 | { | 209 | { |
210 | DbCommand cmd = _conn.CreateCommand(); | 210 | DbCommand cmd = _conn.CreateCommand(); |
211 | cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'"; | 211 | cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'"; |
212 | m_log.InfoFormat("Updating {0} to version {1}", type, version); | 212 | m_log.InfoFormat("[MIGRATIONS] Updating {0} to version {1}", type, version); |
213 | cmd.ExecuteNonQuery(); | 213 | cmd.ExecuteNonQuery(); |
214 | } | 214 | } |
215 | 215 | ||
@@ -230,7 +230,7 @@ namespace OpenSim.Data | |||
230 | Match m = _match.Match(s); | 230 | Match m = _match.Match(s); |
231 | if (m.Success) | 231 | if (m.Success) |
232 | { | 232 | { |
233 | m_log.Info("MIGRATION: Match: " + m.Groups[1].ToString()); | 233 | // m_log.Info("MIGRATION: Match: " + m.Groups[1].ToString()); |
234 | int version = int.Parse(m.Groups[1].ToString()); | 234 | int version = int.Parse(m.Groups[1].ToString()); |
235 | if (version > after) { | 235 | if (version > after) { |
236 | using (Stream resource = _assem.GetManifestResourceStream(s)) | 236 | using (Stream resource = _assem.GetManifestResourceStream(s)) |
@@ -245,9 +245,8 @@ namespace OpenSim.Data | |||
245 | } | 245 | } |
246 | } | 246 | } |
247 | 247 | ||
248 | // TODO: once this is working, get rid of this | ||
249 | if (migrations.Count < 1) { | 248 | if (migrations.Count < 1) { |
250 | m_log.InfoFormat("Resource '{0}' was not found", _type); | 249 | m_log.InfoFormat("[MIGRATIONS] {0} up to date, no migrations to apply", _type); |
251 | } | 250 | } |
252 | return migrations; | 251 | return migrations; |
253 | } | 252 | } |