From c296ad684b2b478bce908590a481a920ce37d80e Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Fri, 24 Aug 2007 12:02:52 +0000
Subject: attempted fix for .NET issue with the database
---
.../OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index f2c7daa..440ca3a 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -751,21 +751,21 @@ namespace OpenSim.DataStore.MonoSqliteStorage
private bool TestTables(SqliteConnection conn)
{
SqliteCommand primSelectCmd = new SqliteCommand(primSelect, conn);
- SqliteDataAdapter primDa = new SqliteDataAdapter(primSelectCmd);
+ SqliteDataAdapter pDa = new SqliteDataAdapter(primSelectCmd);
SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, conn);
- SqliteDataAdapter shapeDa = new SqliteDataAdapter(shapeSelectCmd);
+ SqliteDataAdapter sDa = new SqliteDataAdapter(shapeSelectCmd);
DataSet tmpDS = new DataSet();
try {
- primDa.Fill(tmpDS, "prims");
- shapeDa.Fill(tmpDS, "primshapes");
+ pDa.Fill(tmpDS, "prims");
+ sDa.Fill(tmpDS, "primshapes");
} catch (Mono.Data.SqliteClient.SqliteSyntaxException) {
MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating");
InitDB(conn);
}
- primDa.Fill(tmpDS, "prims");
- shapeDa.Fill(tmpDS, "primshapes");
+ pDa.Fill(tmpDS, "prims");
+ sDa.Fill(tmpDS, "primshapes");
foreach (DataColumn col in createPrimTable().Columns) {
if (! tmpDS.Tables["prims"].Columns.Contains(col.ColumnName) ) {
--
cgit v1.1