From 1cadad9ec62c54fe8ebde8a895817bd980fed975 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sat, 21 Feb 2009 09:39:33 +0000
Subject: * Applied a patch that: Added estate ban table to migration scripts
 and nhibernate mapping. Refactored property getters and setters for estate
 ban object to support NHibernate. * Added estate ban table to migration
 scripts of all supported databases. * Added nhibernate mapping for EstateBans
 property of EstateSettings * Refactored property accessors for EstateBan
 object. * Added comments for EstateBan properties. * Ensured that NHibernate
 tests pass with NUnitGUI. * Ensured that nant test target passes.

This fixes mantis #3210. Thank you, tlaukkan!

---
 OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml      | 11 +++++++++++
 .../NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql | 10 ++++++++++
 .../NHibernate/Resources/MySQLDialect/001_EstateStore.sql     |  9 +++++++++
 .../Resources/PostgreSQLDialect/001_EstateStore.sql           | 10 ++++++++++
 .../NHibernate/Resources/SQLiteDialect/001_EstateStore.sql    | 10 ++++++++++
 5 files changed, 50 insertions(+)

(limited to 'OpenSim/Data/NHibernate')

diff --git a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml b/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
index d8c8975..d300b93 100644
--- a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
@@ -52,6 +52,17 @@
           <index column="ArrayIndex" />
           <element column="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
         </array>
+
+        <array name="EstateBans" table="EstateBans" cascade="all">
+          <key column="EstateID" />
+          <index column="ArrayIndex" />          
+          <composite-element class="OpenSim.Framework.EstateBan, OpenSim.Framework">
+            <property name="BannedUserID" column="BannedUserID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
+            <property name="BannedHostAddress" column="BannedHostAddress" type="String" length="16"/>
+            <property name="BannedHostIPMask" column="BannedHostIPMask" type="String" length="16"/>
+            <property name="BannedHostNameMask" column="BannedHostNameMask" type="String" length="16"/>
+          </composite-element>
+        </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 b852cbc..dd579f9 100644
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
@@ -59,4 +59,14 @@ CREATE TABLE EstateGroups (
   GroupID NVARCHAR(36) NOT NULL,
   ArrayIndex INT NOT NULL,
   PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateBans (
+  EstateID INT NOT NULL,
+  ArrayIndex INT NOT NULL,
+  BannedUserID NVARCHAR(36) NOT NULL,
+  BannedHostAddress NVARCHAR(16) NOT NULL,
+  BannedHostIPMask NVARCHAR(16) NOT NULL,
+  BannedHostNameMask NVARCHAR(16) 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 69635d8..e9ae07e 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
@@ -60,3 +60,12 @@ CREATE TABLE EstateGroups (
   PRIMARY KEY (EstateID,ArrayIndex)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
 
+CREATE TABLE EstateBans (
+  EstateID INT NOT NULL,
+  ArrayIndex INT NOT NULL,
+  BannedUserID VARCHAR(36) NOT NULL,
+  BannedHostAddress VARCHAR(16) NOT NULL,
+  BannedHostIPMask VARCHAR(16) NOT NULL,
+  BannedHostNameMask VARCHAR(16) 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 d13a4d3..3f47930 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
@@ -59,4 +59,14 @@ CREATE TABLE EstateGroups (
   GroupID VARCHAR(36) NOT NULL,
   ArrayIndex INT NOT NULL,
   PRIMARY KEY (EstateID,ArrayIndex)
+);
+
+CREATE TABLE EstateBans (
+  EstateID INT NOT NULL,
+  ArrayIndex INT NOT NULL,
+  BannedUserID VARCHAR(36) NOT NULL,
+  BannedHostAddress VARCHAR(16) NOT NULL,
+  BannedHostIPMask VARCHAR(16) NOT NULL,
+  BannedHostNameMask VARCHAR(16) 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 6e67630..afe702f 100644
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
@@ -59,3 +59,13 @@ CREATE TABLE EstateGroups (
   ArrayIndex INT NOT NULL,
   PRIMARY KEY (EstateID,ArrayIndex)
 );
+
+CREATE TABLE EstateBans (
+  EstateID INT NOT NULL,
+  ArrayIndex INT NOT NULL,
+  BannedUserID VARCHAR(36) NOT NULL,
+  BannedHostAddress VARCHAR(16) NOT NULL,
+  BannedHostIPMask VARCHAR(16) NOT NULL,
+  BannedHostNameMask VARCHAR(16) NOT NULL,
+  PRIMARY KEY (EstateID,ArrayIndex)
+);
-- 
cgit v1.1