parent
8ca805009b
commit
45b90ceef1
|
@ -53,6 +53,9 @@ namespace OpenSim.Data.MySQL.Tests
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
database = new MySQLManager(connect);
|
database = new MySQLManager(connect);
|
||||||
|
// this is important in case a previous run ended badly
|
||||||
|
ClearDB(database);
|
||||||
|
|
||||||
db = new MySQLDataStore();
|
db = new MySQLDataStore();
|
||||||
db.Initialise(connect);
|
db.Initialise(connect);
|
||||||
}
|
}
|
||||||
|
@ -70,24 +73,28 @@ namespace OpenSim.Data.MySQL.Tests
|
||||||
{
|
{
|
||||||
db.Dispose();
|
db.Dispose();
|
||||||
}
|
}
|
||||||
// if a new table is added, it has to be dropped here
|
ClearDB(database);
|
||||||
if (database != null)
|
}
|
||||||
|
|
||||||
|
private void ClearDB(MySQLManager manager)
|
||||||
{
|
{
|
||||||
database.ExecuteSql("drop table migrations");
|
if (manager != null)
|
||||||
database.ExecuteSql("drop table prims");
|
{
|
||||||
database.ExecuteSql("drop table primshapes");
|
manager.ExecuteSql("drop table migrations");
|
||||||
database.ExecuteSql("drop table primitems");
|
manager.ExecuteSql("drop table prims");
|
||||||
database.ExecuteSql("drop table terrain");
|
manager.ExecuteSql("drop table primshapes");
|
||||||
database.ExecuteSql("drop table land");
|
manager.ExecuteSql("drop table primitems");
|
||||||
database.ExecuteSql("drop table landaccesslist");
|
manager.ExecuteSql("drop table terrain");
|
||||||
database.ExecuteSql("drop table regionban");
|
manager.ExecuteSql("drop table land");
|
||||||
database.ExecuteSql("drop table regionsettings");
|
manager.ExecuteSql("drop table landaccesslist");
|
||||||
database.ExecuteSql("drop table estate_managers");
|
manager.ExecuteSql("drop table regionban");
|
||||||
database.ExecuteSql("drop table estate_groups");
|
manager.ExecuteSql("drop table regionsettings");
|
||||||
database.ExecuteSql("drop table estate_users");
|
manager.ExecuteSql("drop table estate_managers");
|
||||||
database.ExecuteSql("drop table estateban");
|
manager.ExecuteSql("drop table estate_groups");
|
||||||
database.ExecuteSql("drop table estate_settings");
|
manager.ExecuteSql("drop table estate_users");
|
||||||
database.ExecuteSql("drop table estate_map");
|
manager.ExecuteSql("drop table estateban");
|
||||||
|
manager.ExecuteSql("drop table estate_settings");
|
||||||
|
manager.ExecuteSql("drop table estate_map");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue