* Apply http://opensimulator.org/mantis/view.php?id=3020

* Adds a grid db implementation and unit tests to the NHibernate module

5 files changed, 53 insertions, 40 deletions

diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql
index 0dfec7f..e4ad525 100644
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_GridStore.sql
@@ -1,5 +1,5 @@
 create table Regions (
-  Uuid NVARCHAR(255) not null,
+   Uuid NVARCHAR(36) not null,
    RegionHandle BIGINT null,
    RegionName NVARCHAR(32) null,
    RegionRecvKey NVARCHAR(128) null,
@@ -24,9 +24,9 @@ create table Regions (
    RegionUserSendKey NVARCHAR(128) null,
    ServerHttpPort INT null,
    ServerRemotingPort INT null,
-   RegionMapTextureID NVARCHAR(255) null,
-   Owner_uuid NVARCHAR(255) null,
-   OriginUUID NVARCHAR(255) null,
+   RegionMapTextureID NVARCHAR(36) null,
+   Owner_uuid NVARCHAR(36) null,
+   OriginUUID NVARCHAR(36) null,
    primary key (Uuid)
 )
 create index region_handle on Regions (RegionHandle)
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_GridStore.sql
index 5fb1c19..c6fe620 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_GridStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_GridStore.sql
@@ -24,10 +24,10 @@ CREATE TABLE Regions (
   RegionUserURI VARCHAR(255) DEFAULT NULL,
   RegionUserRecvKey VARCHAR(128) DEFAULT NULL,
   RegionUserSendKey VARCHAR(128) DEFAULT NULL, 
-  RegionMapTexture VARCHAR(36) DEFAULT NULL,
+  RegionMapTextureId VARCHAR(36) DEFAULT NULL,
   ServerHttpPort INT DEFAULT NULL, 
   ServerRemotingPort INT DEFAULT NULL,
-  PRIMARY KEY  (uuid),
+  PRIMARY KEY (RegionID)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
 
 CREATE INDEX RegionNameIndex ON Regions (RegionName);
diff --git a/OpenSim/Data/NHibernate/Resources/RegionProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionProfileData.hbm.xml
new file mode 100644
index 0000000..5ff37d8
--- /dev/null
+++ b/OpenSim/Data/NHibernate/Resources/RegionProfileData.hbm.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="OpenSim.Data.RegionProfileData, OpenSim.Data" table="Regions" lazy="false">
+        <id name="Uuid" column="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
+            <generator class="assigned" /> 
+        </id>
+
+        <property name="Owner_uuid" column="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        <property name="OriginUUID" column="OriginID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+
+        <property name="RegionHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
+        <property name="RegionName" type="String" length="32" />
+        <property name="RegionRecvKey" type="String" length="128" />
+        <property name="RegionSendKey" type="String" length="128" />
+        <property name="RegionSecret" type="String" length="128" />
+        <property name="RegionDataURI" type="String" length="255" />
+      
+        <property name="ServerIP" type="String" length="64" />
+        <property name="ServerPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+        <property name="ServerURI" type="String" length="255" />
+
+        <property name="RegionLocX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+        <property name="RegionLocY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+        <property name="RegionLocZ" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+
+        <property name="EastOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
+        <property name="WestOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
+        <property name="SouthOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
+        <property name="NorthOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
+
+        <property name="RegionAssetURI" type="String" length="255" />
+        <property name="RegionAssetRecvKey" type="String" length="128" />
+        <property name="RegionAssetSendKey" type="String" length="128" />
+
+        <property name="RegionUserURI" type="String" length="255" />
+        <property name="RegionUserRecvKey" type="String" length="128" />
+        <property name="RegionUserSendKey" type="String" length="128" />
+        <property name="RegionMapTextureID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+
+        <property name="ServerHttpPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+        <property name="ServerRemotingPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+
+    </class>
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index 3144b0b..189389f 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -141,36 +141,5 @@
       <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
       <property name="InvType" type="System.Int32" />
     </class>
-    <class name="OpenSim.Data.RegionProfileData, OpenSim.Data" table="Regions" lazy="false">
-      <id name="Uuid" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
-        <generator class="assigned" />
-      </id>
-      <property name="RegionHandle" index="region_handle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-      <property name="RegionName" index="region_name" type="String" length="32"/>
-      <property name="RegionRecvKey" type="String" length="128"/>
-      <property name="RegionSendKey" type="String" length="128"/>
-      <property name="RegionSecret" type="String" length="128"/>
-      <property name="RegionDataURI" type="String" length="255"/>
-      <property name="ServerIP" type="String" length="64"/>
-      <property name="ServerPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="ServerURI" type="String" length="255"/>
-      <property name="RegionLocX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="RegionLocY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="RegionLocZ" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="EastOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-      <property name="WestOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-      <property name="SouthOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-      <property name="NorthOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" />
-      <property name="RegionAssetURI" type="String" length="255"/>
-      <property name="RegionAssetRecvKey" type="String" length="128"/>
-      <property name="RegionAssetSendKey" type="String" length="128"/>
-      <property name="RegionUserURI" type="String" length="255"/>
-      <property name="RegionUserRecvKey" type="String" length="128"/>
-      <property name="RegionUserSendKey" type="String" length="128"/>
-      <property name="ServerHttpPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="ServerRemotingPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
-      <property name="RegionMapTextureID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
-      <property name="Owner_uuid" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
-      <property name="OriginUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
-    </class>  
+ 
 </hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql
index 336a277..4f09848 100644
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_GridStore.sql
@@ -22,12 +22,12 @@ CREATE TABLE Regions (
   RegionUserURI VARCHAR(255) DEFAULT NULL,
   RegionUserRecvKey VARCHAR(128) DEFAULT NULL,
   RegionUserSendKey VARCHAR(128) DEFAULT NULL, 
-  regionMapTexture VARCHAR(36) DEFAULT NULL,
+  RegionMapTextureId VARCHAR(36) DEFAULT NULL,
   ServerHttpPort INT DEFAULT NULL, 
   ServerRemotingPort INT DEFAULT NULL,
   OwnerID VARCHAR(36) DEFAULT NULL,
   OriginID VARCHAR(36) DEFAULT NULL,
-  PRIMARY KEY  (uuid),
+  PRIMARY KEY (RegionId)
 );
 
 CREATE INDEX RegionNameIndex ON Regions (RegionName);