From a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sat, 14 Feb 2009 19:47:02 +0000 Subject: Thank you kindly, TLaukkan (Tommil) for a patch that: * Created value object for EstateRegionLink for storing the estate region relationship. * Refactored slightly NHibernateManager and NHibernateXXXXData implementations for accesing nhibernate generated ID on insert. ** Changed NHibernateManager.Save method name to Insert as it does Insert. ** Changed NHibernateManager.Save return value object as ID can be both UUID and uint currently. ** Changed NHibernateManager.Load method Id parameter to object as it can be both UUID and uint. * Created NHibernateEstateData implementation. This is the actual estate storage. * Created NHibernate mapping files for both EstateSettings and EstateRegionLink * Created MigrationSyntaxDifferences.txt files to write notes about differences in migration scripts between different databases. * Created estate storage migration scripts for all four databases. * Created estate unit test classes for all four databases. * Updated one missing field to BasicEstateTest.cs * Tested NHibernate unit tests with NUnit GUI. Asset databases fail but that is not related to this patch. * Tested build with both Visual Studio and nant. * Executed build tests with nant succesfully. --- OpenSim/Data/NHibernate/NHibernateRegionData.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Data/NHibernate/NHibernateRegionData.cs') diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index 0cd3969..78db52d 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs @@ -70,7 +70,7 @@ namespace OpenSim.Data.NHibernate } else { - manager.Save(rs); + manager.Insert(rs); } } @@ -82,7 +82,7 @@ namespace OpenSim.Data.NHibernate { regionSettings = new RegionSettings(); regionSettings.RegionUUID = regionUUID; - manager.Save(regionSettings); + manager.Insert(regionSettings); } regionSettings.OnSave += StoreRegionSettings; @@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate else { m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID); - manager.Save(p); + manager.Insert(p); } } @@ -129,7 +129,7 @@ namespace OpenSim.Data.NHibernate else { m_log.InfoFormat("[NHIBERNATE] saving terrain {0}", t.RegionID); - manager.Save(t); + manager.Insert(t); } } @@ -394,7 +394,7 @@ namespace OpenSim.Data.NHibernate foreach (TaskInventoryItem i in items) { - manager.Save(i); + manager.Insert(i); } } -- cgit v1.1