Removing unneeded extension method

--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-06-28 14:57:49 -07:00
parent 59498a6f6b
commit 35fe587b6d
3 changed files with 16 additions and 15 deletions

View File

@@ -61,12 +61,15 @@ namespace Orchard.Tests.Data.Builders {
new Dictionary<string, object> {{"ProviderName", "SQLite"}})
});
var sessionFactory = manager.BuildSessionFactory(new SessionFactoryParameters {
var parameters = new SessionFactoryParameters {
Provider = "SQLite",
DataFolder = _tempDataFolder,
UpdateSchema = true,
RecordDescriptors = recordDescriptors
});
};
var sessionFactory = manager
.CreateProvider(parameters)
.BuildSessionFactory(parameters);
var session = sessionFactory.OpenSession();
@@ -95,13 +98,16 @@ namespace Orchard.Tests.Data.Builders {
(dataFolder, connectionString) => new SqlServerDataServicesProvider(dataFolder, connectionString),
new Dictionary<string, object> {{"ProviderName", "SqlServer"}})
});
var sessionFactory = manager.BuildSessionFactory(new SessionFactoryParameters {
var parameters = new SessionFactoryParameters {
Provider = "SqlServer",
DataFolder = _tempDataFolder,
ConnectionString = "Data Source=.\\SQLEXPRESS;AttachDbFileName=" + databasePath + ";Integrated Security=True;User Instance=True;",
UpdateSchema = true,
RecordDescriptors = recordDescriptors,
});
};
var sessionFactory = manager
.CreateProvider(parameters)
.BuildSessionFactory(parameters);

View File

@@ -1,14 +1,5 @@
using NHibernate;
namespace Orchard.Data.Providers {
public interface IDataServicesProviderFactory : IDependency {
IDataServicesProvider CreateProvider(DataServiceParameters sessionFactoryParameters);
}
public static class IDataServicesProviderSelectorExtensions {
public static ISessionFactory BuildSessionFactory(this IDataServicesProviderFactory factory, SessionFactoryParameters sessionFactoryParameters) {
var provider = factory.CreateProvider(sessionFactoryParameters);
return provider != null ? provider.BuildSessionFactory(sessionFactoryParameters) : null;
}
}
}

View File

@@ -81,14 +81,18 @@ namespace Orchard.Data {
var shellFolder = _appDataFolder.MapPath(shellPath);
var sessionFactory = _dataServicesProviderFactory.BuildSessionFactory(new SessionFactoryParameters {
var parameters = new SessionFactoryParameters {
Provider = _shellSettings.DataProvider,
DataFolder = shellFolder,
ConnectionString = _shellSettings.DataConnectionString,
CreateDatabase = createDatabase,
UpdateSchema = updateSchema,
RecordDescriptors = _shellBlueprint.Records,
});
};
var sessionFactory = _dataServicesProviderFactory
.CreateProvider(parameters)
.BuildSessionFactory(parameters);
return sessionFactory;
}