OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch from #3012 Fixing a minor bug where nhibernate mappings from outside OpenSim.Data.NHibernate assembly were not included in sessionFactory. Thanks mpallari!

0.6.3-post-fixes
Adam Johnson 2009-01-25 08:31:08 +00:00
parent 76206543e8
commit 444320e4a6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Data/NHibernate/NHibernateManager.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate
/// Parses the connection string and creates the NHibernate configuration /// Parses the connection string and creates the NHibernate configuration
/// </summary> /// </summary>
/// <param name="connect">NHibernate dialect, driver and connection string separated by ';'</param> /// <param name="connect">NHibernate dialect, driver and connection string separated by ';'</param>
private void parseConnectionString(string connect) private void ParseConnectionString(string connect)
{ {
// Split out the dialect, driver, and connect string // Split out the dialect, driver, and connect string
char[] split = { ';' }; char[] split = { ';' };
@ -73,7 +73,6 @@ namespace OpenSim.Data.NHibernate
configuration.SetProperty(Environment.ConnectionString, parts[2]); configuration.SetProperty(Environment.ConnectionString, parts[2]);
configuration.AddAssembly("OpenSim.Data.NHibernate"); configuration.AddAssembly("OpenSim.Data.NHibernate");
sessionFactory = configuration.BuildSessionFactory();
} }
/// <summary> /// <summary>
@ -82,7 +81,7 @@ namespace OpenSim.Data.NHibernate
/// <param name="dialect">Dialect in use</param> /// <param name="dialect">Dialect in use</param>
/// <param name="assembly">Assembly where migration files exist</param> /// <param name="assembly">Assembly where migration files exist</param>
/// <param name="store">Name of the store in use</param> /// <param name="store">Name of the store in use</param>
private void runMigration(string dialect, Assembly assembly, string store) private void RunMigration(string dialect, Assembly assembly, string store)
{ {
// Migration subtype is the folder name under which migrations are stored. For mysql this folder is // Migration subtype is the folder name under which migrations are stored. For mysql this folder is
// MySQLDialect instead of MySQL5Dialect which is the dialect currently in use. To avoid renaming // MySQLDialect instead of MySQL5Dialect which is the dialect currently in use. To avoid renaming
@ -104,7 +103,7 @@ namespace OpenSim.Data.NHibernate
/// <param name="store">Name of the store</param> /// <param name="store">Name of the store</param>
public NHibernateManager(string connect, string store) public NHibernateManager(string connect, string store)
{ {
parseConnectionString(connect); ParseConnectionString(connect);
//To create sql file uncomment code below and write the name of the file //To create sql file uncomment code below and write the name of the file
//SchemaExport exp = new SchemaExport(cfg); //SchemaExport exp = new SchemaExport(cfg);
@ -113,7 +112,8 @@ namespace OpenSim.Data.NHibernate
Assembly assembly = GetType().Assembly; Assembly assembly = GetType().Assembly;
runMigration(dialect, assembly, store); sessionFactory = configuration.BuildSessionFactory();
RunMigration(dialect, assembly, store);
} }
/// <summary> /// <summary>
@ -121,14 +121,14 @@ namespace OpenSim.Data.NHibernate
/// </summary> /// </summary>
/// <param name="connect">NHibernate dialect, driver and connection string separated by ';'</param> /// <param name="connect">NHibernate dialect, driver and connection string separated by ';'</param>
/// <param name="store">Name of the store</param> /// <param name="store">Name of the store</param>
/// <param name="assembly"></param> /// <param name="assembly">Outside assembly to be included </param>
public NHibernateManager(string connect, string store, Assembly assembly) public NHibernateManager(string connect, string store, Assembly assembly)
{ {
parseConnectionString(connect); ParseConnectionString(connect);
configuration.AddAssembly(assembly); configuration.AddAssembly(assembly);
sessionFactory = configuration.BuildSessionFactory();
runMigration(dialect, assembly, store); RunMigration(dialect, assembly, store);
} }
public object Load(Type type, UUID uuid) public object Load(Type type, UUID uuid)