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

* Adds estate access list supports to NHibernate data module
* Thanks Tommil

5 files changed, 105 insertions, 0 deletions

diff --git a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml b/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
index 2dc3949..d8c8975 100644
--- a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
@@ -35,5 +35,23 @@
       
         <property name="AbuseEmail" type="String" length="255" />
 
+        <array name="EstateManagers" table="EstateManagers" cascade="all">
+          <key column="EstateID" />
+          <index column="ArrayIndex" />
+          <element column="ManagerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        </array>
+
+        <array name="EstateAccess" table="EstateUsers" cascade="all">
+          <key column="EstateID" />
+          <index column="ArrayIndex" />
+          <element column="UserID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        </array>
+
+        <array name="EstateGroups" table="EstateGroups" cascade="all">
+          <key column="EstateID" />
+          <index column="ArrayIndex" />
+          <element column="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        </array>
+      
     </class>
 </hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
index 4ca51be..b852cbc 100644
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
@@ -38,3 +38,25 @@ CREATE TABLE EstateRegionLink (
 
 CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
 CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
+
+
+CREATE TABLE EstateManagers (
+  EstateID INT NOT NULL,
+  ManagerID NVARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateUsers (
+  EstateID INT NOT NULL,
+  UserID NVARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateGroups (
+  EstateID INT NOT NULL,
+  GroupID NVARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
index 2114186..69635d8 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
@@ -38,3 +38,25 @@ CREATE TABLE EstateRegionLink (
 
 CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
 CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
+
+CREATE TABLE EstateManagers (
+  EstateID INT NOT NULL,
+  ManagerID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+
+CREATE TABLE EstateUsers (
+  EstateID INT NOT NULL,
+  UserID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+
+CREATE TABLE EstateGroups (
+  EstateID INT NOT NULL,
+  GroupID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
index e43fd86..d13a4d3 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
@@ -38,3 +38,25 @@ CREATE TABLE EstateRegionLink (
 
 CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
 CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
+
+
+CREATE TABLE EstateManagers (
+  EstateID INT NOT NULL,
+  ManagerID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateUsers (
+  EstateID INT NOT NULL,
+  UserID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateGroups (
+  EstateID INT NOT NULL,
+  GroupID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
\ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
index b540bc6..6e67630 100644
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
@@ -38,3 +38,24 @@ CREATE TABLE EstateRegionLink (
 
 CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
 CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
+
+CREATE TABLE EstateManagers (
+  EstateID INT NOT NULL,
+  ManagerID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateUsers (
+  EstateID INT NOT NULL,
+  UserID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateGroups (
+  EstateID INT NOT NULL,
+  GroupID VARCHAR(36) NOT NULL,
+  ArrayIndex INT NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);