From 8b75302a1e33f1f5cee166dd22d1de44172da509 Mon Sep 17 00:00:00 2001
From: AlexRa
Date: Tue, 27 Apr 2010 10:05:17 +0300
Subject: Just a bit of spellchecking in the comments
---
OpenSim/Data/MySQL/MySQLInventoryData.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 192deb2..e0e9b9c 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -145,7 +145,7 @@ namespace OpenSim.Data.MySQL
///
/// Returns a list of the root folders within a users inventory
///
- /// The user whos inventory is to be searched
+ /// The user whose inventory is to be searched
/// A list of folder objects
public List getUserRootFolders(UUID user)
{
@@ -284,7 +284,7 @@ namespace OpenSim.Data.MySQL
{
InventoryItemBase item = new InventoryItemBase();
- // TODO: this is to handle a case where NULLs creep in there, which we are not sure is indemic to the system, or legacy. It would be nice to live fix these.
+ // TODO: this is to handle a case where NULLs creep in there, which we are not sure is endemic to the system, or legacy. It would be nice to live fix these.
if (reader["creatorID"] == null)
{
item.CreatorId = UUID.Zero.ToString();
--
cgit v1.1
From b49e9eff562076786f68088155c6a0c8b1192e4a Mon Sep 17 00:00:00 2001
From: AlexRa
Date: Wed, 28 Apr 2010 13:11:42 +0300
Subject: Fixed comments in Migration.cs: wrong argument order (no change to
code)
---
OpenSim/Data/Migration.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 0fb9e78..5ca8e44 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Data
/// When a database driver starts up, it specifies a resource that
/// needs to be brought up to the current revision. For instance:
///
- /// Migration um = new Migration(Assembly, DbConnection, "Users");
- /// um.Upgrade();
+ /// Migration um = new Migration(DbConnection, Assembly, "Users");
+ /// um.Update();
///
/// This works out which version Users is at, and applies all the
/// revisions past it to it. If there is no users table, all
--
cgit v1.1
From be1141f0f7994cb068683e07fe99936025361001 Mon Sep 17 00:00:00 2001
From: AlexRa
Date: Wed, 28 Apr 2010 13:40:35 +0300
Subject: Refactoring in Migration.cs: "using()" instead of explicit Dispose()
This ensures that 'cmd' gets disposed on errors
---
OpenSim/Data/Migration.cs | 108 ++++++++++++++++++++++++----------------------
1 file changed, 56 insertions(+), 52 deletions(-)
(limited to 'OpenSim/Data')
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 5ca8e44..06defe4 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -110,10 +110,11 @@ namespace OpenSim.Data
return;
// If not, create the migration tables
- DbCommand cmd = _conn.CreateCommand();
- cmd.CommandText = _migrations_create;
- cmd.ExecuteNonQuery();
- cmd.Dispose();
+ using (DbCommand cmd = _conn.CreateCommand())
+ {
+ cmd.CommandText = _migrations_create;
+ cmd.ExecuteNonQuery();
+ }
InsertVersion("migrations", 1);
}
@@ -131,37 +132,37 @@ namespace OpenSim.Data
m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision {1}.", _type, migrations.Keys[migrations.Count - 1]);
m_log.Info("[MIGRATIONS] NOTE: this may take a while, don't interupt this process!");
- DbCommand cmd = _conn.CreateCommand();
- foreach (KeyValuePair kvp in migrations)
+ using (DbCommand cmd = _conn.CreateCommand())
{
- int newversion = kvp.Key;
- cmd.CommandText = kvp.Value;
- // we need to up the command timeout to infinite as we might be doing long migrations.
- cmd.CommandTimeout = 0;
- try
- {
- cmd.ExecuteNonQuery();
- }
- catch (Exception e)
+ foreach (KeyValuePair kvp in migrations)
{
- m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
- m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
- cmd.CommandText = "ROLLBACK;";
- cmd.ExecuteNonQuery();
- }
+ int newversion = kvp.Key;
+ cmd.CommandText = kvp.Value;
+ // we need to up the command timeout to infinite as we might be doing long migrations.
+ cmd.CommandTimeout = 0;
+ try
+ {
+ cmd.ExecuteNonQuery();
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
+ m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
+ cmd.CommandText = "ROLLBACK;";
+ cmd.ExecuteNonQuery();
+ }
- if (version == 0)
- {
- InsertVersion(_type, newversion);
- }
- else
- {
- UpdateVersion(_type, newversion);
+ if (version == 0)
+ {
+ InsertVersion(_type, newversion);
+ }
+ else
+ {
+ UpdateVersion(_type, newversion);
+ }
+ version = newversion;
}
- version = newversion;
}
-
- cmd.Dispose();
}
// private int MaxVersion()
@@ -200,43 +201,46 @@ namespace OpenSim.Data
protected virtual int FindVersion(DbConnection conn, string type)
{
int version = 0;
- DbCommand cmd = conn.CreateCommand();
- try
+ using (DbCommand cmd = conn.CreateCommand())
{
- cmd.CommandText = "select version from migrations where name='" + type +"' order by version desc";
- using (IDataReader reader = cmd.ExecuteReader())
+ try
{
- if (reader.Read())
+ cmd.CommandText = "select version from migrations where name='" + type + "' order by version desc";
+ using (IDataReader reader = cmd.ExecuteReader())
{
- 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
}
}
- catch
- {
- // Something went wrong, so we're version 0
- }
- cmd.Dispose();
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("[MIGRATIONS]: Creating {0} at version {1}", type, version);
- cmd.ExecuteNonQuery();
- cmd.Dispose();
+ using (DbCommand cmd = _conn.CreateCommand())
+ {
+ cmd.CommandText = "insert into migrations(name, version) values('" + type + "', " + version + ")";
+ m_log.InfoFormat("[MIGRATIONS]: Creating {0} at version {1}", type, version);
+ cmd.ExecuteNonQuery();
+ }
}
private void UpdateVersion(string type, int version)
{
- DbCommand cmd = _conn.CreateCommand();
- cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'";
- m_log.InfoFormat("[MIGRATIONS]: Updating {0} to version {1}", type, version);
- cmd.ExecuteNonQuery();
- cmd.Dispose();
+ using (DbCommand cmd = _conn.CreateCommand())
+ {
+ cmd.CommandText = "update migrations set version=" + version + " where name='" + type + "'";
+ m_log.InfoFormat("[MIGRATIONS]: Updating {0} to version {1}", type, version);
+ cmd.ExecuteNonQuery();
+ }
}
// private SortedList GetAllMigrations()
--
cgit v1.1