diff options
Diffstat (limited to 'OpenSim/Data/NHibernate/Resources')
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 @@ | |||
1 | create table Regions ( | 1 | create table Regions ( |
2 | Uuid NVARCHAR(255) not null, | 2 | Uuid NVARCHAR(36) not null, |
3 | RegionHandle BIGINT null, | 3 | RegionHandle BIGINT null, |
4 | RegionName NVARCHAR(32) null, | 4 | RegionName NVARCHAR(32) null, |
5 | RegionRecvKey NVARCHAR(128) null, | 5 | RegionRecvKey NVARCHAR(128) null, |
@@ -24,9 +24,9 @@ create table Regions ( | |||
24 | RegionUserSendKey NVARCHAR(128) null, | 24 | RegionUserSendKey NVARCHAR(128) null, |
25 | ServerHttpPort INT null, | 25 | ServerHttpPort INT null, |
26 | ServerRemotingPort INT null, | 26 | ServerRemotingPort INT null, |
27 | RegionMapTextureID NVARCHAR(255) null, | 27 | RegionMapTextureID NVARCHAR(36) null, |
28 | Owner_uuid NVARCHAR(255) null, | 28 | Owner_uuid NVARCHAR(36) null, |
29 | OriginUUID NVARCHAR(255) null, | 29 | OriginUUID NVARCHAR(36) null, |
30 | primary key (Uuid) | 30 | primary key (Uuid) |
31 | ) | 31 | ) |
32 | create index region_handle on Regions (RegionHandle) | 32 | 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 ( | |||
24 | RegionUserURI VARCHAR(255) DEFAULT NULL, | 24 | RegionUserURI VARCHAR(255) DEFAULT NULL, |
25 | RegionUserRecvKey VARCHAR(128) DEFAULT NULL, | 25 | RegionUserRecvKey VARCHAR(128) DEFAULT NULL, |
26 | RegionUserSendKey VARCHAR(128) DEFAULT NULL, | 26 | RegionUserSendKey VARCHAR(128) DEFAULT NULL, |
27 | RegionMapTexture VARCHAR(36) DEFAULT NULL, | 27 | RegionMapTextureId VARCHAR(36) DEFAULT NULL, |
28 | ServerHttpPort INT DEFAULT NULL, | 28 | ServerHttpPort INT DEFAULT NULL, |
29 | ServerRemotingPort INT DEFAULT NULL, | 29 | ServerRemotingPort INT DEFAULT NULL, |
30 | PRIMARY KEY (uuid), | 30 | PRIMARY KEY (RegionID) |
31 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; | 31 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; |
32 | 32 | ||
33 | CREATE INDEX RegionNameIndex ON Regions (RegionName); | 33 | 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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> | ||
3 | <class name="OpenSim.Data.RegionProfileData, OpenSim.Data" table="Regions" lazy="false"> | ||
4 | <id name="Uuid" column="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | ||
5 | <generator class="assigned" /> | ||
6 | </id> | ||
7 | |||
8 | <property name="Owner_uuid" column="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | ||
9 | <property name="OriginUUID" column="OriginID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | ||
10 | |||
11 | <property name="RegionHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
12 | <property name="RegionName" type="String" length="32" /> | ||
13 | <property name="RegionRecvKey" type="String" length="128" /> | ||
14 | <property name="RegionSendKey" type="String" length="128" /> | ||
15 | <property name="RegionSecret" type="String" length="128" /> | ||
16 | <property name="RegionDataURI" type="String" length="255" /> | ||
17 | |||
18 | <property name="ServerIP" type="String" length="64" /> | ||
19 | <property name="ServerPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
20 | <property name="ServerURI" type="String" length="255" /> | ||
21 | |||
22 | <property name="RegionLocX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
23 | <property name="RegionLocY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
24 | <property name="RegionLocZ" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
25 | |||
26 | <property name="EastOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
27 | <property name="WestOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
28 | <property name="SouthOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
29 | <property name="NorthOverrideHandle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
30 | |||
31 | <property name="RegionAssetURI" type="String" length="255" /> | ||
32 | <property name="RegionAssetRecvKey" type="String" length="128" /> | ||
33 | <property name="RegionAssetSendKey" type="String" length="128" /> | ||
34 | |||
35 | <property name="RegionUserURI" type="String" length="255" /> | ||
36 | <property name="RegionUserRecvKey" type="String" length="128" /> | ||
37 | <property name="RegionUserSendKey" type="String" length="128" /> | ||
38 | <property name="RegionMapTextureID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | ||
39 | |||
40 | <property name="ServerHttpPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
41 | <property name="ServerRemotingPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
42 | |||
43 | </class> | ||
44 | </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 @@ | |||
141 | <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 141 | <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
142 | <property name="InvType" type="System.Int32" /> | 142 | <property name="InvType" type="System.Int32" /> |
143 | </class> | 143 | </class> |
144 | <class name="OpenSim.Data.RegionProfileData, OpenSim.Data" table="Regions" lazy="false"> | 144 | |
145 | <id name="Uuid" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | ||
146 | <generator class="assigned" /> | ||
147 | </id> | ||
148 | <property name="RegionHandle" index="region_handle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
149 | <property name="RegionName" index="region_name" type="String" length="32"/> | ||
150 | <property name="RegionRecvKey" type="String" length="128"/> | ||
151 | <property name="RegionSendKey" type="String" length="128"/> | ||
152 | <property name="RegionSecret" type="String" length="128"/> | ||
153 | <property name="RegionDataURI" type="String" length="255"/> | ||
154 | <property name="ServerIP" type="String" length="64"/> | ||
155 | <property name="ServerPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
156 | <property name="ServerURI" type="String" length="255"/> | ||
157 | <property name="RegionLocX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
158 | <property name="RegionLocY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
159 | <property name="RegionLocZ" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
160 | <property name="EastOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
161 | <property name="WestOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
162 | <property name="SouthOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
163 | <property name="NorthOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
164 | <property name="RegionAssetURI" type="String" length="255"/> | ||
165 | <property name="RegionAssetRecvKey" type="String" length="128"/> | ||
166 | <property name="RegionAssetSendKey" type="String" length="128"/> | ||
167 | <property name="RegionUserURI" type="String" length="255"/> | ||
168 | <property name="RegionUserRecvKey" type="String" length="128"/> | ||
169 | <property name="RegionUserSendKey" type="String" length="128"/> | ||
170 | <property name="ServerHttpPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
171 | <property name="ServerRemotingPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
172 | <property name="RegionMapTextureID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | ||
173 | <property name="Owner_uuid" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | ||
174 | <property name="OriginUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | ||
175 | </class> | ||
176 | </hibernate-mapping> | 145 | </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 ( | |||
22 | RegionUserURI VARCHAR(255) DEFAULT NULL, | 22 | RegionUserURI VARCHAR(255) DEFAULT NULL, |
23 | RegionUserRecvKey VARCHAR(128) DEFAULT NULL, | 23 | RegionUserRecvKey VARCHAR(128) DEFAULT NULL, |
24 | RegionUserSendKey VARCHAR(128) DEFAULT NULL, | 24 | RegionUserSendKey VARCHAR(128) DEFAULT NULL, |
25 | regionMapTexture VARCHAR(36) DEFAULT NULL, | 25 | RegionMapTextureId VARCHAR(36) DEFAULT NULL, |
26 | ServerHttpPort INT DEFAULT NULL, | 26 | ServerHttpPort INT DEFAULT NULL, |
27 | ServerRemotingPort INT DEFAULT NULL, | 27 | ServerRemotingPort INT DEFAULT NULL, |
28 | OwnerID VARCHAR(36) DEFAULT NULL, | 28 | OwnerID VARCHAR(36) DEFAULT NULL, |
29 | OriginID VARCHAR(36) DEFAULT NULL, | 29 | OriginID VARCHAR(36) DEFAULT NULL, |
30 | PRIMARY KEY (uuid), | 30 | PRIMARY KEY (RegionId) |
31 | ); | 31 | ); |
32 | 32 | ||
33 | CREATE INDEX RegionNameIndex ON Regions (RegionName); | 33 | CREATE INDEX RegionNameIndex ON Regions (RegionName); |