diff options
author | Sean Dague | 2008-08-27 19:24:40 +0000 |
---|---|---|
committer | Sean Dague | 2008-08-27 19:24:40 +0000 |
commit | b625a36ae52a546976045e8a3e9afbcf6765f956 (patch) | |
tree | 7c9e8043a5d40585698b11eef8edfd3483575762 /OpenSim/Data/SQLite | |
parent | Erm - make the distanc factor really work.... (diff) | |
download | opensim-SC-b625a36ae52a546976045e8a3e9afbcf6765f956.zip opensim-SC-b625a36ae52a546976045e8a3e9afbcf6765f956.tar.gz opensim-SC-b625a36ae52a546976045e8a3e9afbcf6765f956.tar.bz2 opensim-SC-b625a36ae52a546976045e8a3e9afbcf6765f956.tar.xz |
we are now past change 6000, so getting rid of the pre-Migration
upgrade cruft
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 9b274f4..220cebf 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -77,11 +77,6 @@ namespace OpenSim.Data.SQLite | |||
77 | 77 | ||
78 | Assembly assem = GetType().Assembly; | 78 | Assembly assem = GetType().Assembly; |
79 | Migration m = new Migration(m_conn, assem, "AssetStore"); | 79 | Migration m = new Migration(m_conn, assem, "AssetStore"); |
80 | // TODO: remove this next line after changeset 6000, | ||
81 | // people should have all gotten into the migration swing | ||
82 | // again. | ||
83 | TestTables(m_conn, m); | ||
84 | |||
85 | m.Update(); | 80 | m.Update(); |
86 | 81 | ||
87 | return; | 82 | return; |
@@ -232,42 +227,6 @@ namespace OpenSim.Data.SQLite | |||
232 | } | 227 | } |
233 | } | 228 | } |
234 | 229 | ||
235 | /*********************************************************************** | ||
236 | * | ||
237 | * Database Definition Functions | ||
238 | * | ||
239 | * This should be db agnostic as we define them in ADO.NET terms | ||
240 | * | ||
241 | **********************************************************************/ | ||
242 | |||
243 | /// <summary> | ||
244 | /// Create the "assets" table | ||
245 | /// </summary> | ||
246 | /// <returns></returns> | ||
247 | // private static DataTable createAssetsTable() | ||
248 | // { | ||
249 | // DataTable assets = new DataTable("assets"); | ||
250 | |||
251 | // SQLiteUtil.createCol(assets, "UUID", typeof (String)); | ||
252 | // SQLiteUtil.createCol(assets, "Name", typeof (String)); | ||
253 | // SQLiteUtil.createCol(assets, "Description", typeof (String)); | ||
254 | // SQLiteUtil.createCol(assets, "Type", typeof (Int32)); | ||
255 | // SQLiteUtil.createCol(assets, "Local", typeof (Boolean)); | ||
256 | // SQLiteUtil.createCol(assets, "Temporary", typeof (Boolean)); | ||
257 | // SQLiteUtil.createCol(assets, "Data", typeof (Byte[])); | ||
258 | // // Add in contraints | ||
259 | // assets.PrimaryKey = new DataColumn[] {assets.Columns["UUID"]}; | ||
260 | // return assets; | ||
261 | // } | ||
262 | |||
263 | /*********************************************************************** | ||
264 | * | ||
265 | * Convert between ADO.NET <=> OpenSim Objects | ||
266 | * | ||
267 | * These should be database independant | ||
268 | * | ||
269 | **********************************************************************/ | ||
270 | |||
271 | /// <summary> | 230 | /// <summary> |
272 | /// | 231 | /// |
273 | /// </summary> | 232 | /// </summary> |
@@ -300,46 +259,6 @@ namespace OpenSim.Data.SQLite | |||
300 | * | 259 | * |
301 | **********************************************************************/ | 260 | **********************************************************************/ |
302 | 261 | ||
303 | /// <summary> | ||
304 | /// | ||
305 | /// </summary> | ||
306 | /// <param name="conn"></param> | ||
307 | // private static void InitDB(SqliteConnection conn) | ||
308 | // { | ||
309 | // string createAssets = SQLiteUtil.defineTable(createAssetsTable()); | ||
310 | // SqliteCommand pcmd = new SqliteCommand(createAssets, conn); | ||
311 | // pcmd.ExecuteNonQuery(); | ||
312 | // } | ||
313 | |||
314 | /// <summary> | ||
315 | /// | ||
316 | /// </summary> | ||
317 | /// <param name="conn"></param> | ||
318 | /// <param name="m"></param> | ||
319 | /// <returns></returns> | ||
320 | private static bool TestTables(SqliteConnection conn, Migration m) | ||
321 | { | ||
322 | SqliteCommand cmd = new SqliteCommand(assetSelect, conn); | ||
323 | SqliteDataAdapter pDa = new SqliteDataAdapter(cmd); | ||
324 | DataSet tmpDS = new DataSet(); | ||
325 | try | ||
326 | { | ||
327 | pDa.Fill(tmpDS, "assets"); | ||
328 | } | ||
329 | catch (SqliteSyntaxException) | ||
330 | { | ||
331 | m_log.Info("[ASSET DB]: SQLite Database doesn't exist... creating"); | ||
332 | return false; | ||
333 | } | ||
334 | |||
335 | // if the tables are here, and we don't have a migration, | ||
336 | // set it to 1, as we're migrating off of legacy bits | ||
337 | if (m.Version == 0) | ||
338 | m.Version = 1; | ||
339 | |||
340 | return true; | ||
341 | } | ||
342 | |||
343 | #region IPlugin interface | 262 | #region IPlugin interface |
344 | 263 | ||
345 | /// <summary> | 264 | /// <summary> |