lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-03 20:13:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removing unneeded extension method

Browse Source 
--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
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Tests/Data/Builders/SessionFactoryBuilderTests.cs
View File

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

9
src/Orchard/Data/Providers/IDataServicesProviderFactory.cs
View File

@@ -1,14 +1,5 @@
using NHibernate;
namespace Orchard.Data.Providers { namespace Orchard.Data.Providers {
public interface IDataServicesProviderFactory : IDependency { public interface IDataServicesProviderFactory : IDependency {
IDataServicesProvider CreateProvider(DataServiceParameters sessionFactoryParameters); 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;
}
}
} }

8
src/Orchard/Data/SessionFactoryHolder.cs
View File

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