aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate/NHibernateRegionData.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/NHibernateRegionData.cs
parentAdd an override for the % operator. (diff)
downloadopensim-SC-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.zip
opensim-SC-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.gz
opensim-SC-a583d8ad70daad8c755c2f43e2f2af7bc5b7ee4d.tar.bz2
opensim-SC-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/NHibernateRegionData.cs10
1 files changed, 5 insertions, 5 deletions
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
70 } 70 }
71 else 71 else
72 { 72 {
73 manager.Save(rs); 73 manager.Insert(rs);
74 } 74 }
75 } 75 }
76 76
@@ -82,7 +82,7 @@ namespace OpenSim.Data.NHibernate
82 { 82 {
83 regionSettings = new RegionSettings(); 83 regionSettings = new RegionSettings();
84 regionSettings.RegionUUID = regionUUID; 84 regionSettings.RegionUUID = regionUUID;
85 manager.Save(regionSettings); 85 manager.Insert(regionSettings);
86 } 86 }
87 87
88 regionSettings.OnSave += StoreRegionSettings; 88 regionSettings.OnSave += StoreRegionSettings;
@@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate
105 else 105 else
106 { 106 {
107 m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID); 107 m_log.InfoFormat("[NHIBERNATE] saving object {0}", p.UUID);
108 manager.Save(p); 108 manager.Insert(p);
109 } 109 }
110 110
111 } 111 }
@@ -129,7 +129,7 @@ namespace OpenSim.Data.NHibernate
129 else 129 else
130 { 130 {
131 m_log.InfoFormat("[NHIBERNATE] saving terrain {0}", t.RegionID); 131 m_log.InfoFormat("[NHIBERNATE] saving terrain {0}", t.RegionID);
132 manager.Save(t); 132 manager.Insert(t);
133 } 133 }
134 134
135 } 135 }
@@ -394,7 +394,7 @@ namespace OpenSim.Data.NHibernate
394 394
395 foreach (TaskInventoryItem i in items) 395 foreach (TaskInventoryItem i in items)
396 { 396 {
397 manager.Save(i); 397 manager.Insert(i);
398 398
399 } 399 }
400 } 400 }