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

enable autocreation of mysql inventory tables again. I think 

I stopped the looping issue on continous upgrade with this as well.
afrisby
Sean Dague 2007-12-10 22:12:52 +00:00
parent 22acc23755
commit ce1ed11aba
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Framework.Data.MySQL
database = database =
new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling,
settingPort); settingPort);
// TestTables(database.Connection); TestTables(database.Connection);
} }
#region Test and initialization code #region Test and initialization code
@ -74,10 +74,10 @@ namespace OpenSim.Framework.Data.MySQL
} }
// if the table is already at the current version, then we can exit immediately // if the table is already at the current version, then we can exit immediately
if (oldVersion == "Rev. 2") // if (oldVersion == "Rev. 2")
return; // return;
database.ExecuteResourceSql("UpgradeFoldersTableToVersion2.sql"); // database.ExecuteResourceSql("UpgradeFoldersTableToVersion2.sql");
} }
private void UpgradeItemsTable(string oldVersion) private void UpgradeItemsTable(string oldVersion)
@ -90,10 +90,10 @@ namespace OpenSim.Framework.Data.MySQL
} }
// if the table is already at the current version, then we can exit immediately // if the table is already at the current version, then we can exit immediately
if (oldVersion == "Rev. 2") // if (oldVersion == "Rev. 2")
return; // return;
database.ExecuteResourceSql("UpgradeItemsTableToVersion2.sql"); // database.ExecuteResourceSql("UpgradeItemsTableToVersion2.sql");
} }
private void TestTables(MySqlConnection conn) private void TestTables(MySqlConnection conn)
@ -104,6 +104,8 @@ namespace OpenSim.Framework.Data.MySQL
tableList["inventoryitems"] = null; tableList["inventoryitems"] = null;
database.GetTableVersion(tableList); database.GetTableVersion(tableList);
MainLog.Instance.Verbose("MYSQL", "Inventory Folder Version: " + tableList["inventoryfolders"]);
MainLog.Instance.Verbose("MYSQL", "Inventory Items Version: " + tableList["inventoryitems"]);
UpgradeFoldersTable(tableList["inventoryfolders"]); UpgradeFoldersTable(tableList["inventoryfolders"]);
UpgradeItemsTable(tableList["inventoryitems"]); UpgradeItemsTable(tableList["inventoryitems"]);