OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get region prim saving working properly in SQLiteNG 

it wasn't working because of debug work that I'd forgotton to take out
0.6.9
Justin Clark-Casey (justincc) 2010-04-23 20:56:24 +01:00
parent b46380e373
commit 705b675d28
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Data/SQLiteNG/SQLiteRegionData.cs
View File

@ -98,10 +98,7 @@ namespace OpenSim.Data.SQLiteNG
m_conn.Open(); m_conn.Open();
SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn); SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn);
//SqliteCommand primSelectCmd = new SqliteCommand(primSelect, m_conn); primDa = new SqliteDataAdapter(primSelectCmd);
//primDa = new SqliteDataAdapter(primSelectCmd);
primDa = new SqliteDataAdapter(primSelect, m_connectionString);
// SqliteCommandBuilder primCb = new SqliteCommandBuilder(primDa);
SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn); SqliteCommand shapeSelectCmd = new SqliteCommand(shapeSelect, m_conn);
shapeDa = new SqliteDataAdapter(shapeSelectCmd); shapeDa = new SqliteDataAdapter(shapeSelectCmd);
@ -128,17 +125,14 @@ namespace OpenSim.Data.SQLiteNG
lock (ds) lock (ds)
{ {
//ds.Tables.Add(createPrimTable()); ds.Tables.Add(createPrimTable());
//setupPrimCommands(primDa, m_conn); setupPrimCommands(primDa, m_conn);
//primDa.Fill(ds.Tables["prims"]);
primDa.Fill(ds, "prims");
ds.Tables.Add(createShapeTable()); ds.Tables.Add(createShapeTable());
setupShapeCommands(shapeDa, m_conn); setupShapeCommands(shapeDa, m_conn);
ds.Tables.Add(createItemsTable()); ds.Tables.Add(createItemsTable());
setupItemsCommands(itemsDa, m_conn); setupItemsCommands(itemsDa, m_conn);
itemsDa.Fill(ds.Tables["primitems"]);
ds.Tables.Add(createTerrainTable()); ds.Tables.Add(createTerrainTable());
setupTerrainCommands(terrainDa, m_conn); setupTerrainCommands(terrainDa, m_conn);
@ -150,13 +144,21 @@ namespace OpenSim.Data.SQLiteNG
setupLandAccessCommands(landAccessListDa, m_conn); setupLandAccessCommands(landAccessListDa, m_conn);
ds.Tables.Add(createRegionSettingsTable()); ds.Tables.Add(createRegionSettingsTable());
setupRegionSettingsCommands(regionSettingsDa, m_conn); setupRegionSettingsCommands(regionSettingsDa, m_conn);
// WORKAROUND: This is a work around for sqlite on // WORKAROUND: This is a work around for sqlite on
// windows, which gets really unhappy with blob columns // windows, which gets really unhappy with blob columns
// that have no sample data in them. At some point we // that have no sample data in them. At some point we
// need to actually find a proper way to handle this. // need to actually find a proper way to handle this.
try
{
primDa.Fill(ds.Tables["prims"]);
}
catch (Exception)
{
m_log.Info("[REGION DB]: Caught fill error on prims table");
}
try try
{ {
shapeDa.Fill(ds.Tables["primshapes"]); shapeDa.Fill(ds.Tables["primshapes"]);
@ -204,6 +206,7 @@ namespace OpenSim.Data.SQLiteNG
// We have to create a data set mapping for every table, otherwise the IDataAdaptor.Update() will not populate rows with values! // We have to create a data set mapping for every table, otherwise the IDataAdaptor.Update() will not populate rows with values!
// Not sure exactly why this is - this kind of thing was not necessary before - justincc 20100409 // Not sure exactly why this is - this kind of thing was not necessary before - justincc 20100409
// Possibly because we manually set up our own DataTables before connecting to the database
CreateDataSetMapping(primDa, "prims"); CreateDataSetMapping(primDa, "prims");
CreateDataSetMapping(shapeDa, "primshapes"); CreateDataSetMapping(shapeDa, "primshapes");
CreateDataSetMapping(itemsDa, "primitems"); CreateDataSetMapping(itemsDa, "primitems");