aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorSean Dague2007-12-10 22:12:52 +0000
committerSean Dague2007-12-10 22:12:52 +0000
commitce1ed11aba1fcab7b6d30a9bbcbd476d9dee59dc (patch)
tree7e713a3e67d57f31c36f2d158295f127b90b381a /OpenSim/Framework
parentGreat Salutations to Alondria for providing implementations for: (diff)
downloadopensim-SC_OLD-ce1ed11aba1fcab7b6d30a9bbcbd476d9dee59dc.zip
opensim-SC_OLD-ce1ed11aba1fcab7b6d30a9bbcbd476d9dee59dc.tar.gz
opensim-SC_OLD-ce1ed11aba1fcab7b6d30a9bbcbd476d9dee59dc.tar.bz2
opensim-SC_OLD-ce1ed11aba1fcab7b6d30a9bbcbd476d9dee59dc.tar.xz
enable autocreation of mysql inventory tables again. I think
I stopped the looping issue on continous upgrade with this as well.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs16
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 70d9ba9..edf7c43 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Data.MySQL
59 database = 59 database =
60 new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, 60 new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling,
61 settingPort); 61 settingPort);
62 // TestTables(database.Connection); 62 TestTables(database.Connection);
63 } 63 }
64 64
65 #region Test and initialization code 65 #region Test and initialization code
@@ -74,10 +74,10 @@ namespace OpenSim.Framework.Data.MySQL
74 } 74 }
75 75
76 // if the table is already at the current version, then we can exit immediately 76 // if the table is already at the current version, then we can exit immediately
77 if (oldVersion == "Rev. 2") 77// if (oldVersion == "Rev. 2")
78 return; 78// return;
79 79
80 database.ExecuteResourceSql("UpgradeFoldersTableToVersion2.sql"); 80// database.ExecuteResourceSql("UpgradeFoldersTableToVersion2.sql");
81 } 81 }
82 82
83 private void UpgradeItemsTable(string oldVersion) 83 private void UpgradeItemsTable(string oldVersion)
@@ -90,10 +90,10 @@ namespace OpenSim.Framework.Data.MySQL
90 } 90 }
91 91
92 // if the table is already at the current version, then we can exit immediately 92 // if the table is already at the current version, then we can exit immediately
93 if (oldVersion == "Rev. 2") 93// if (oldVersion == "Rev. 2")
94 return; 94// return;
95 95
96 database.ExecuteResourceSql("UpgradeItemsTableToVersion2.sql"); 96// database.ExecuteResourceSql("UpgradeItemsTableToVersion2.sql");
97 } 97 }
98 98
99 private void TestTables(MySqlConnection conn) 99 private void TestTables(MySqlConnection conn)
@@ -104,6 +104,8 @@ namespace OpenSim.Framework.Data.MySQL
104 tableList["inventoryitems"] = null; 104 tableList["inventoryitems"] = null;
105 105
106 database.GetTableVersion(tableList); 106 database.GetTableVersion(tableList);
107 MainLog.Instance.Verbose("MYSQL", "Inventory Folder Version: " + tableList["inventoryfolders"]);
108 MainLog.Instance.Verbose("MYSQL", "Inventory Items Version: " + tableList["inventoryitems"]);
107 109
108 UpgradeFoldersTable(tableList["inventoryfolders"]); 110 UpgradeFoldersTable(tableList["inventoryfolders"]);
109 UpgradeItemsTable(tableList["inventoryitems"]); 111 UpgradeItemsTable(tableList["inventoryitems"]);