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/NHibernateAssetData.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/NHibernate/NHibernateAssetData.cs')

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
 
         public override void Initialise()
         {
-            Initialise("SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3");
+            m_log.Info("[NHibernateGridData]: " + Name + " cannot be default-initialized!");
+            throw new PluginNotInitialisedException(Name);
         }
 
         public override void Initialise(string connect)
@@ -66,7 +67,7 @@ namespace OpenSim.Data.NHibernate
             AssetBase temp = (AssetBase)manager.Load(typeof(AssetBase), asset.Metadata.FullID);
             if (temp == null)
             {
-                manager.Save(asset);
+                manager.Insert(asset);
             }
         }
 
-- 
cgit v1.1