better fix for 551, not sure why I missed this earlier

0.6.0-stable
Sean Dague 2008-03-12 02:48:08 +00:00
parent 6da664edbe
commit 163a7cb6c8
1 changed files with 9 additions and 11 deletions

View File

@ -62,6 +62,8 @@ namespace OpenSim.Framework.Data.SQLite
m_log.Info("[Inventory]: Sqlite - connecting: " + dbfile); m_log.Info("[Inventory]: Sqlite - connecting: " + dbfile);
SqliteConnection conn = new SqliteConnection(connectionString); SqliteConnection conn = new SqliteConnection(connectionString);
conn.Open();
TestTables(conn); TestTables(conn);
SqliteCommand itemsSelectCmd = new SqliteCommand(invItemsSelect, conn); SqliteCommand itemsSelectCmd = new SqliteCommand(invItemsSelect, conn);
@ -612,19 +614,15 @@ namespace OpenSim.Framework.Data.SQLite
**********************************************************************/ **********************************************************************/
private void InitDB(SqliteConnection conn) private void InitDB(SqliteConnection conn)
{
lock (ds)
{ {
string createInventoryItems = defineTable(createInventoryItemsTable()); string createInventoryItems = defineTable(createInventoryItemsTable());
string createInventoryFolders = defineTable(createInventoryFoldersTable()); string createInventoryFolders = defineTable(createInventoryFoldersTable());
SqliteCommand pcmd = new SqliteCommand(createInventoryItems, conn); SqliteCommand pcmd = new SqliteCommand(createInventoryItems, conn);
SqliteCommand scmd = new SqliteCommand(createInventoryFolders, conn); SqliteCommand scmd = new SqliteCommand(createInventoryFolders, conn);
conn.Open();
pcmd.ExecuteNonQuery(); pcmd.ExecuteNonQuery();
scmd.ExecuteNonQuery(); scmd.ExecuteNonQuery();
conn.Close();
}
} }
private bool TestTables(SqliteConnection conn) private bool TestTables(SqliteConnection conn)