mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 18:55:58 +08:00
Fixed the naming mess around data connectors for simulation data
This commit is contained in:
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
|
||||
/// <summary>
|
||||
/// A MSSQL Interface for the Region Server.
|
||||
/// </summary>
|
||||
public class MSSQLRegionDataStore : IRegionDataStore
|
||||
public class MSSQLSimulationData : ISimulationDataStore
|
||||
{
|
||||
private const string _migrationStore = "RegionStore";
|
||||
|
||||
@@ -45,7 +45,7 @@ namespace OpenSim.Data.MySQL
|
||||
/// <summary>
|
||||
/// A MySQL Interface for the Region Server
|
||||
/// </summary>
|
||||
public class MySQLDataStore : IRegionDataStore
|
||||
public class MySQLSimulationData : ISimulationDataStore
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace OpenSim.Data.Null
|
||||
/// <summary>
|
||||
/// NULL DataStore, do not store anything
|
||||
/// </summary>
|
||||
public class NullDataStore : IRegionDataStore
|
||||
public class NullSimulationData : ISimulationDataStore
|
||||
{
|
||||
public void Initialise(string dbfile)
|
||||
{
|
||||
@@ -44,7 +44,7 @@ namespace OpenSim.Data.SQLite
|
||||
/// <summary>
|
||||
/// A RegionData Interface to the SQLite database
|
||||
/// </summary>
|
||||
public class SQLiteRegionData : IRegionDataStore
|
||||
public class SQLiteSimulationData : ISimulationDataStore
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace OpenSim.Data.SQLiteLegacy
|
||||
/// <summary>
|
||||
/// A RegionData Interface to the SQLite database
|
||||
/// </summary>
|
||||
public class SQLiteRegionData : IRegionDataStore
|
||||
public class SQLiteSimulationData : ISimulationDataStore
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
@@ -61,17 +61,17 @@ namespace OpenSim.Data.Tests
|
||||
#else
|
||||
|
||||
[TestFixture(Description = "Region store tests (SQLite)")]
|
||||
public class SQLiteRegionTests : RegionTests<SqliteConnection, SQLiteRegionData>
|
||||
public class SQLiteRegionTests : RegionTests<SqliteConnection, SQLiteSimulationData>
|
||||
{
|
||||
}
|
||||
|
||||
[TestFixture(Description = "Region store tests (MySQL)")]
|
||||
public class MySqlRegionTests : RegionTests<MySqlConnection, MySQLDataStore>
|
||||
public class MySqlRegionTests : RegionTests<MySqlConnection, MySQLSimulationData>
|
||||
{
|
||||
}
|
||||
|
||||
[TestFixture(Description = "Region store tests (MS SQL Server)")]
|
||||
public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLRegionDataStore>
|
||||
public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLSimulationData>
|
||||
{
|
||||
}
|
||||
|
||||
@@ -79,11 +79,11 @@ namespace OpenSim.Data.Tests
|
||||
|
||||
public class RegionTests<TConn, TRegStore> : BasicDataServiceTest<TConn, TRegStore>
|
||||
where TConn : DbConnection, new()
|
||||
where TRegStore : class, IRegionDataStore, new()
|
||||
where TRegStore : class, ISimulationDataStore, new()
|
||||
{
|
||||
bool m_rebuildDB;
|
||||
|
||||
public IRegionDataStore db;
|
||||
public ISimulationDataStore db;
|
||||
public UUID zero = UUID.Zero;
|
||||
public UUID region1 = UUID.Random();
|
||||
public UUID region2 = UUID.Random();
|
||||
@@ -122,7 +122,7 @@ namespace OpenSim.Data.Tests
|
||||
protected override void InitService(object service)
|
||||
{
|
||||
ClearDB();
|
||||
db = (IRegionDataStore)service;
|
||||
db = (ISimulationDataStore)service;
|
||||
db.Initialise(m_connStr);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user