diff options
| author | Sean Dague | 2007-08-24 12:02:52 +0000 |
|---|---|---|
| committer | Sean Dague | 2007-08-24 12:02:52 +0000 |
| commit | c296ad684b2b478bce908590a481a920ce37d80e (patch) | |
| tree | b8a6e56124c7c3f69bc5f1bc0260723a409f8ab0 /OpenSim/Region/Storage | |
| parent | Scripts are now copied into a prim (ie new copy placed in the prim) rather th... (diff) | |
| download | opensim-SC_OLD-c296ad684b2b478bce908590a481a920ce37d80e.zip opensim-SC_OLD-c296ad684b2b478bce908590a481a920ce37d80e.tar.gz opensim-SC_OLD-c296ad684b2b478bce908590a481a920ce37d80e.tar.bz2 opensim-SC_OLD-c296ad684b2b478bce908590a481a920ce37d80e.tar.xz | |
attempted fix for .NET issue with the database
Diffstat (limited to 'OpenSim/Region/Storage')
| -rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | 12 |
1 files 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 | |||
| 751 | private bool TestTables(SqliteConnection conn) | 751 | private bool TestTables(SqliteConnection conn) |
| 752 | { | 752 | { |
| 753 | SqliteCommand primSelectCmd = new SqliteCommand(primSelect, conn); | 753 | SqliteCommand primSelectCmd = new SqliteCommand(primSelect, conn); |
| 754 | SqliteDataAdapter primDa = new SqliteDataAdapter(primSelectCmd); | 754 | SqliteDataAdapter pDa = new SqliteDataAdapter(primSelectCmd); |
| 755 | SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, conn); | 755 | SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, conn); |
| 756 | SqliteDataAdapter shapeDa = new SqliteDataAdapter(shapeSelectCmd); | 756 | SqliteDataAdapter sDa = new SqliteDataAdapter(shapeSelectCmd); |
| 757 | 757 | ||
| 758 | DataSet tmpDS = new DataSet(); | 758 | DataSet tmpDS = new DataSet(); |
| 759 | try { | 759 | try { |
| 760 | primDa.Fill(tmpDS, "prims"); | 760 | pDa.Fill(tmpDS, "prims"); |
| 761 | shapeDa.Fill(tmpDS, "primshapes"); | 761 | sDa.Fill(tmpDS, "primshapes"); |
| 762 | } catch (Mono.Data.SqliteClient.SqliteSyntaxException) { | 762 | } catch (Mono.Data.SqliteClient.SqliteSyntaxException) { |
| 763 | MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating"); | 763 | MainLog.Instance.Verbose("DATASTORE", "SQLite Database doesn't exist... creating"); |
| 764 | InitDB(conn); | 764 | InitDB(conn); |
| 765 | } | 765 | } |
| 766 | 766 | ||
| 767 | primDa.Fill(tmpDS, "prims"); | 767 | pDa.Fill(tmpDS, "prims"); |
| 768 | shapeDa.Fill(tmpDS, "primshapes"); | 768 | sDa.Fill(tmpDS, "primshapes"); |
| 769 | 769 | ||
| 770 | foreach (DataColumn col in createPrimTable().Columns) { | 770 | foreach (DataColumn col in createPrimTable().Columns) { |
| 771 | if (! tmpDS.Tables["prims"].Columns.Contains(col.ColumnName) ) { | 771 | if (! tmpDS.Tables["prims"].Columns.Contains(col.ColumnName) ) { |