aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate/NHibernateAssetData.cs
diff options
context:
space:
mode:
authorCharles Krinke2009-02-14 19:47:02 +0000
committerCharles Krinke2009-02-14 19:47:02 +0000
commita583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d (patch)
tree7e90740b7ea86922db55905a34e3b6e065cb6041 /OpenSim/Data/NHibernate/NHibernateAssetData.cs
parentAdd an override for the % operator. (diff)
downloadopensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.zip
opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.gz
opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.bz2
opensim-SC_OLD-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index f4527bf..f8715cc 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -45,7 +45,8 @@ namespace OpenSim.Data.NHibernate
45 45
46 public override void Initialise() 46 public override void Initialise()
47 { 47 {
48 Initialise("SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3"); 48 m_log.Info("[NHibernateGridData]: " + Name + " cannot be default-initialized!");
49 throw new PluginNotInitialisedException(Name);
49 } 50 }
50 51
51 public override void Initialise(string connect) 52 public override void Initialise(string connect)
@@ -66,7 +67,7 @@ namespace OpenSim.Data.NHibernate
66 AssetBase temp = (AssetBase)manager.Load(typeof(AssetBase), asset.Metadata.FullID); 67 AssetBase temp = (AssetBase)manager.Load(typeof(AssetBase), asset.Metadata.FullID);
67 if (temp == null) 68 if (temp == null)
68 { 69 {
69 manager.Save(asset); 70 manager.Insert(asset);
70 } 71 }
71 } 72 }
72 73