* Trivial sqlite inventory db log message change so I can pick out the messages more easily
parent
a9cc76e0ef
commit
f3b44deeee
|
@ -55,7 +55,7 @@ namespace OpenSim.Data.SQLite
|
||||||
if (dbconnect == string.Empty) {
|
if (dbconnect == string.Empty) {
|
||||||
dbconnect = "URI=file:inventoryStore.db,version=3";
|
dbconnect = "URI=file:inventoryStore.db,version=3";
|
||||||
}
|
}
|
||||||
m_log.Info("[Inventory]: Sqlite - connecting: " + dbconnect);
|
m_log.Info("[INVENTORY DB]: Sqlite - connecting: " + dbconnect);
|
||||||
SqliteConnection conn = new SqliteConnection(dbconnect);
|
SqliteConnection conn = new SqliteConnection(dbconnect);
|
||||||
|
|
||||||
conn.Open();
|
conn.Open();
|
||||||
|
@ -74,12 +74,12 @@ namespace OpenSim.Data.SQLite
|
||||||
ds.Tables.Add(createInventoryFoldersTable());
|
ds.Tables.Add(createInventoryFoldersTable());
|
||||||
invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
|
invFoldersDa.Fill(ds.Tables["inventoryfolders"]);
|
||||||
setupFoldersCommands(invFoldersDa, conn);
|
setupFoldersCommands(invFoldersDa, conn);
|
||||||
m_log.Info("[DATASTORE]: Populated Inventory Folders Definitions");
|
m_log.Info("[INVENTORY DB]: Populated Inventory Folders Definitions");
|
||||||
|
|
||||||
ds.Tables.Add(createInventoryItemsTable());
|
ds.Tables.Add(createInventoryItemsTable());
|
||||||
invItemsDa.Fill(ds.Tables["inventoryitems"]);
|
invItemsDa.Fill(ds.Tables["inventoryitems"]);
|
||||||
setupItemsCommands(invItemsDa, conn);
|
setupItemsCommands(invItemsDa, conn);
|
||||||
m_log.Info("[DATASTORE]: Populated Inventory Items Definitions");
|
m_log.Info("[INVENTORY DB]: Populated Inventory Items Definitions");
|
||||||
|
|
||||||
ds.AcceptChanges();
|
ds.AcceptChanges();
|
||||||
}
|
}
|
||||||
|
@ -674,7 +674,7 @@ namespace OpenSim.Data.SQLite
|
||||||
}
|
}
|
||||||
catch (SqliteSyntaxException)
|
catch (SqliteSyntaxException)
|
||||||
{
|
{
|
||||||
m_log.Info("[DATASTORE]: SQLite Database doesn't exist... creating");
|
m_log.Info("[INVENTORY DB]: SQLite Database doesn't exist... creating");
|
||||||
InitDB(conn);
|
InitDB(conn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -693,7 +693,7 @@ namespace OpenSim.Data.SQLite
|
||||||
}
|
}
|
||||||
catch (SqliteSyntaxException)
|
catch (SqliteSyntaxException)
|
||||||
{
|
{
|
||||||
m_log.Info("[DATASTORE]: Upgrading sqlite inventory database to version 2");
|
m_log.Info("[INVENTORY DB]: Upgrading sqlite inventory database to version 2");
|
||||||
|
|
||||||
cmd = new SqliteCommand("alter table inventoryitems add column salePrice integer default 99;", conn);
|
cmd = new SqliteCommand("alter table inventoryitems add column salePrice integer default 99;", conn);
|
||||||
cmd.ExecuteNonQuery();
|
cmd.ExecuteNonQuery();
|
||||||
|
@ -719,7 +719,7 @@ namespace OpenSim.Data.SQLite
|
||||||
{
|
{
|
||||||
if (! tmpDS.Tables["inventoryitems"].Columns.Contains(col.ColumnName))
|
if (! tmpDS.Tables["inventoryitems"].Columns.Contains(col.ColumnName))
|
||||||
{
|
{
|
||||||
m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName);
|
m_log.Info("[INVENTORY DB]: Missing required column:" + col.ColumnName);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -727,7 +727,7 @@ namespace OpenSim.Data.SQLite
|
||||||
{
|
{
|
||||||
if (! tmpDS.Tables["inventoryfolders"].Columns.Contains(col.ColumnName))
|
if (! tmpDS.Tables["inventoryfolders"].Columns.Contains(col.ColumnName))
|
||||||
{
|
{
|
||||||
m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName);
|
m_log.Info("[INVENTORY DB]: Missing required column:" + col.ColumnName);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue