diff options
author | lbsa71 | 2009-02-21 09:39:33 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-21 09:39:33 +0000 |
commit | 1cadad9ec62c54fe8ebde8a895817bd980fed975 (patch) | |
tree | 00e9f96a1486fdb59a65494ef0bf88cbde082c2c /OpenSim/Data/NHibernate/Resources | |
parent | Add copyright headers. Minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-1cadad9ec62c54fe8ebde8a895817bd980fed975.zip opensim-SC_OLD-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.gz opensim-SC_OLD-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.bz2 opensim-SC_OLD-1cadad9ec62c54fe8ebde8a895817bd980fed975.tar.xz |
* 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!
Diffstat (limited to '')
5 files changed, 50 insertions, 0 deletions
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 @@ | |||
52 | <index column="ArrayIndex" /> | 52 | <index column="ArrayIndex" /> |
53 | <element column="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 53 | <element column="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
54 | </array> | 54 | </array> |
55 | |||
56 | <array name="EstateBans" table="EstateBans" cascade="all"> | ||
57 | <key column="EstateID" /> | ||
58 | <index column="ArrayIndex" /> | ||
59 | <composite-element class="OpenSim.Framework.EstateBan, OpenSim.Framework"> | ||
60 | <property name="BannedUserID" column="BannedUserID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | ||
61 | <property name="BannedHostAddress" column="BannedHostAddress" type="String" length="16"/> | ||
62 | <property name="BannedHostIPMask" column="BannedHostIPMask" type="String" length="16"/> | ||
63 | <property name="BannedHostNameMask" column="BannedHostNameMask" type="String" length="16"/> | ||
64 | </composite-element> | ||
65 | </array> | ||
55 | 66 | ||
56 | </class> | 67 | </class> |
57 | </hibernate-mapping> | 68 | </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 ( | |||
59 | GroupID NVARCHAR(36) NOT NULL, | 59 | GroupID NVARCHAR(36) NOT NULL, |
60 | ArrayIndex INT NOT NULL, | 60 | ArrayIndex INT NOT NULL, |
61 | PRIMARY KEY (EstateID,ArrayIndex) | 61 | PRIMARY KEY (EstateID,ArrayIndex) |
62 | ); | ||
63 | |||
64 | CREATE TABLE EstateBans ( | ||
65 | EstateID INT NOT NULL, | ||
66 | ArrayIndex INT NOT NULL, | ||
67 | BannedUserID NVARCHAR(36) NOT NULL, | ||
68 | BannedHostAddress NVARCHAR(16) NOT NULL, | ||
69 | BannedHostIPMask NVARCHAR(16) NOT NULL, | ||
70 | BannedHostNameMask NVARCHAR(16) NOT NULL, | ||
71 | PRIMARY KEY (EstateID,ArrayIndex) | ||
62 | ); \ No newline at end of file | 72 | ); \ 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 ( | |||
60 | PRIMARY KEY (EstateID,ArrayIndex) | 60 | PRIMARY KEY (EstateID,ArrayIndex) |
61 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; | 61 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; |
62 | 62 | ||
63 | CREATE TABLE EstateBans ( | ||
64 | EstateID INT NOT NULL, | ||
65 | ArrayIndex INT NOT NULL, | ||
66 | BannedUserID VARCHAR(36) NOT NULL, | ||
67 | BannedHostAddress VARCHAR(16) NOT NULL, | ||
68 | BannedHostIPMask VARCHAR(16) NOT NULL, | ||
69 | BannedHostNameMask VARCHAR(16) NOT NULL, | ||
70 | PRIMARY KEY (EstateID,ArrayIndex) | ||
71 | ) 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 ( | |||
59 | GroupID VARCHAR(36) NOT NULL, | 59 | GroupID VARCHAR(36) NOT NULL, |
60 | ArrayIndex INT NOT NULL, | 60 | ArrayIndex INT NOT NULL, |
61 | PRIMARY KEY (EstateID,ArrayIndex) | 61 | PRIMARY KEY (EstateID,ArrayIndex) |
62 | ); | ||
63 | |||
64 | CREATE TABLE EstateBans ( | ||
65 | EstateID INT NOT NULL, | ||
66 | ArrayIndex INT NOT NULL, | ||
67 | BannedUserID VARCHAR(36) NOT NULL, | ||
68 | BannedHostAddress VARCHAR(16) NOT NULL, | ||
69 | BannedHostIPMask VARCHAR(16) NOT NULL, | ||
70 | BannedHostNameMask VARCHAR(16) NOT NULL, | ||
71 | PRIMARY KEY (EstateID,ArrayIndex) | ||
62 | ); \ No newline at end of file | 72 | ); \ 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 ( | |||
59 | ArrayIndex INT NOT NULL, | 59 | ArrayIndex INT NOT NULL, |
60 | PRIMARY KEY (EstateID,ArrayIndex) | 60 | PRIMARY KEY (EstateID,ArrayIndex) |
61 | ); | 61 | ); |
62 | |||
63 | CREATE TABLE EstateBans ( | ||
64 | EstateID INT NOT NULL, | ||
65 | ArrayIndex INT NOT NULL, | ||
66 | BannedUserID VARCHAR(36) NOT NULL, | ||
67 | BannedHostAddress VARCHAR(16) NOT NULL, | ||
68 | BannedHostIPMask VARCHAR(16) NOT NULL, | ||
69 | BannedHostNameMask VARCHAR(16) NOT NULL, | ||
70 | PRIMARY KEY (EstateID,ArrayIndex) | ||
71 | ); | ||