diff options
-rw-r--r-- | OpenSim/Data/MySQL/MySQLAssetData.cs | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index bdb1571..08a8c6e 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -78,10 +78,6 @@ namespace OpenSim.Data.MySQL | |||
78 | Assembly assem = GetType().Assembly; | 78 | Assembly assem = GetType().Assembly; |
79 | Migration m = new Migration(_dbConnection.Connection, assem, "AssetStore"); | 79 | Migration m = new Migration(_dbConnection.Connection, assem, "AssetStore"); |
80 | 80 | ||
81 | // TODO: After rev 6000, remove this. People should have | ||
82 | // been rolled onto the new migration code by then. | ||
83 | TestTables(m); | ||
84 | |||
85 | m.Update(); | 81 | m.Update(); |
86 | } | 82 | } |
87 | 83 | ||
@@ -115,44 +111,6 @@ namespace OpenSim.Data.MySQL | |||
115 | #region IAssetProviderPlugin Members | 111 | #region IAssetProviderPlugin Members |
116 | 112 | ||
117 | /// <summary> | 113 | /// <summary> |
118 | /// <list type="bullet"> | ||
119 | /// <item>Execute CreateAssetsTable.sql if oldVersion == null</item> | ||
120 | /// <item>do nothing if oldVersion != null</item> | ||
121 | /// </list> | ||
122 | /// </summary> | ||
123 | /// <param name="oldVersion"></param> | ||
124 | // private void UpgradeAssetsTable(string oldVersion) | ||
125 | // { | ||
126 | // // null as the version, indicates that the table didn't exist | ||
127 | // if (oldVersion == null) | ||
128 | // { | ||
129 | // m_log.Info("[ASSETS DB]: Creating new database tables"); | ||
130 | // _dbConnection.ExecuteResourceSql("CreateAssetsTable.sql"); | ||
131 | // return; | ||
132 | // } | ||
133 | // } | ||
134 | |||
135 | /// <summary> | ||
136 | /// Ensure that the assets related tables exists and are at the latest version | ||
137 | /// </summary> | ||
138 | /// <param name="m"></param> | ||
139 | private void TestTables(Migration m) | ||
140 | { | ||
141 | Dictionary<string, string> tableList = new Dictionary<string, string>(); | ||
142 | |||
143 | tableList["assets"] = null; | ||
144 | _dbConnection.GetTableVersion(tableList); | ||
145 | |||
146 | // if there is no table, return, migrations will handle it. | ||
147 | if (tableList["assets"] == null) | ||
148 | return; | ||
149 | |||
150 | // if there is a table, and we don't have a migration, set it to 1 | ||
151 | if (m.Version == 0) | ||
152 | m.Version = 1; | ||
153 | } | ||
154 | |||
155 | /// <summary> | ||
156 | /// Fetch Asset <paramref name="assetID"/> from database | 114 | /// Fetch Asset <paramref name="assetID"/> from database |
157 | /// </summary> | 115 | /// </summary> |
158 | /// <param name="assetID">Asset UUID to fetch</param> | 116 | /// <param name="assetID">Asset UUID to fetch</param> |