diff options
author | Charles Krinke | 2009-01-11 18:24:16 +0000 |
---|---|---|
committer | Charles Krinke | 2009-01-11 18:24:16 +0000 |
commit | 40f34aeffd64e2aa81cecb2e861f60d6e8886198 (patch) | |
tree | 5d0059eb7aa70799c8239bb273efc997138cabb5 /OpenSim/Data/NHibernate/Resources/MySQLDialect | |
parent | Thank you kindly, Tlaukkan (Tommil) for a patch that: (diff) | |
download | opensim-SC-40f34aeffd64e2aa81cecb2e861f60d6e8886198.zip opensim-SC-40f34aeffd64e2aa81cecb2e861f60d6e8886198.tar.gz opensim-SC-40f34aeffd64e2aa81cecb2e861f60d6e8886198.tar.bz2 opensim-SC-40f34aeffd64e2aa81cecb2e861f60d6e8886198.tar.xz |
Thank you kindly, Tlaukkan (Tommil) for a patch that:
Fixed all NHibernate unit tests by implementing missing persistency
methods, tables, columns and fixing bugs in the existing implementation.
Two minor changes to classes outside NHibernate module: Added Scene
instantiation for SceneObjectGroup in OpenSim.Data.Tests.BasicRegionTest
as this was required by the NHibernate persistency. In the process added
also mock constructor to Scene which only populates RegionInfo in the scene
which is used by ScenePart.RegionUUID. NHibernate module is still in
experimental state and has not been tested at opensim region or ugaim runtime
configuration. Adding unit tests to build is not yet advisable nor using
NHibernate module in any production setup.
Diffstat (limited to 'OpenSim/Data/NHibernate/Resources/MySQLDialect')
3 files changed, 168 insertions, 86 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql index 99a5227..158ebb4 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | |||
@@ -1,8 +1,15 @@ | |||
1 | CREATE TABLE `Prims` ( | 1 | CREATE TABLE `Prims` ( |
2 | `UUID` char(36) NOT NULL default '', | ||
3 | `RegionID` char(36) default NULL, | ||
4 | `GroupID` char(36) default NULL, | ||
2 | `ParentID` int(11) default NULL, | 5 | `ParentID` int(11) default NULL, |
6 | `ParentUUID` char(36) default NULL, | ||
7 | `OwnerID` char(36) default NULL, | ||
8 | `LastOwnerID` char(36) default NULL, | ||
9 | `CreatorID` char(36) default NULL, | ||
3 | `CreationDate` int(11) default NULL, | 10 | `CreationDate` int(11) default NULL, |
11 | `LinkNum` int(11) default NULL, | ||
4 | `Name` varchar(255) default NULL, | 12 | `Name` varchar(255) default NULL, |
5 | `ParentUUID` char(36) default NULL, | ||
6 | `Text` varchar(255) default NULL, | 13 | `Text` varchar(255) default NULL, |
7 | `Description` varchar(255) default NULL, | 14 | `Description` varchar(255) default NULL, |
8 | `SitName` varchar(255) default NULL, | 15 | `SitName` varchar(255) default NULL, |
@@ -13,43 +20,43 @@ CREATE TABLE `Prims` ( | |||
13 | `GroupMask` int(11) default NULL, | 20 | `GroupMask` int(11) default NULL, |
14 | `EveryoneMask` int(11) default NULL, | 21 | `EveryoneMask` int(11) default NULL, |
15 | `BaseMask` int(11) default NULL, | 22 | `BaseMask` int(11) default NULL, |
16 | `PositionX` float default NULL, | 23 | `Material` int(1) default NULL, |
17 | `PositionY` float default NULL, | 24 | `ScriptAccessPin` int(11) default NULL, |
18 | `PositionZ` float default NULL, | 25 | `TextureAnimation` blob, |
19 | `GroupPositionX` float default NULL, | 26 | `ParticleSystem` blob, |
20 | `GroupPositionY` float default NULL, | 27 | `ClickAction` int(1) default NULL, |
21 | `GroupPositionZ` float default NULL, | 28 | `Color` int(11) default NULL, |
22 | `VelocityX` float default NULL, | 29 | `PositionX` double default NULL, |
23 | `VelocityY` float default NULL, | 30 | `PositionY` double default NULL, |
24 | `VelocityZ` float default NULL, | 31 | `PositionZ` double default NULL, |
25 | `AngularVelocityX` float default NULL, | 32 | `GroupPositionX` double default NULL, |
26 | `AngularVelocityY` float default NULL, | 33 | `GroupPositionY` double default NULL, |
27 | `AngularVelocityZ` float default NULL, | 34 | `GroupPositionZ` double default NULL, |
28 | `AccelerationX` float default NULL, | 35 | `VelocityX` double default NULL, |
29 | `AccelerationY` float default NULL, | 36 | `VelocityY` double default NULL, |
30 | `AccelerationZ` float default NULL, | 37 | `VelocityZ` double default NULL, |
31 | `RotationX` float default NULL, | 38 | `AngularVelocityX` double default NULL, |
32 | `RotationY` float default NULL, | 39 | `AngularVelocityY` double default NULL, |
33 | `RotationZ` float default NULL, | 40 | `AngularVelocityZ` double default NULL, |
34 | `RotationW` float default NULL, | 41 | `AccelerationX` double default NULL, |
35 | `SitTargetOffsetX` float default NULL, | 42 | `AccelerationY` double default NULL, |
36 | `SitTargetOffsetY` float default NULL, | 43 | `AccelerationZ` double default NULL, |
37 | `SitTargetOffsetZ` float default NULL, | 44 | `RotationX` double default NULL, |
38 | `SitTargetOrientW` float default NULL, | 45 | `RotationY` double default NULL, |
39 | `SitTargetOrientX` float default NULL, | 46 | `RotationZ` double default NULL, |
40 | `SitTargetOrientY` float default NULL, | 47 | `RotationW` double default NULL, |
41 | `SitTargetOrientZ` float default NULL, | 48 | `SitTargetOffsetX` double default NULL, |
42 | `UUID` char(36) NOT NULL default '', | 49 | `SitTargetOffsetY` double default NULL, |
43 | `RegionID` char(36) default NULL, | 50 | `SitTargetOffsetZ` double default NULL, |
44 | `CreatorID` char(36) default NULL, | 51 | `SitTargetOrientW` double default NULL, |
45 | `OwnerID` char(36) default NULL, | 52 | `SitTargetOrientX` double default NULL, |
46 | `GroupID` char(36) default NULL, | 53 | `SitTargetOrientY` double default NULL, |
47 | `LastOwnerID` char(36) default NULL, | 54 | `SitTargetOrientZ` double default NULL, |
48 | -- this is the shape | 55 | -- this is the shape |
49 | `Shape` int(11) default NULL, | 56 | `Shape` int(11) default NULL, |
50 | `ScaleX` float default NULL, | 57 | `ScaleX` double default NULL, |
51 | `ScaleY` float default NULL, | 58 | `ScaleY` double default NULL, |
52 | `ScaleZ` float default NULL, | 59 | `ScaleZ` double default NULL, |
53 | `PCode` int(11) default NULL, | 60 | `PCode` int(11) default NULL, |
54 | `PathBegin` int(11) default NULL, | 61 | `PathBegin` int(11) default NULL, |
55 | `PathEnd` int(11) default NULL, | 62 | `PathEnd` int(11) default NULL, |
@@ -77,3 +84,4 @@ CREATE TABLE `Prims` ( | |||
77 | KEY `prims_parentuuid` (`ParentUUID`) | 84 | KEY `prims_parentuuid` (`ParentUUID`) |
78 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 85 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
79 | 86 | ||
87 | |||
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql index 5db5d29..a66f5b8 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_UserStore.sql | |||
@@ -1,12 +1,12 @@ | |||
1 | START TRANSACTION; | 1 | START TRANSACTION; |
2 | 2 | ||
3 | CREATE TABLE `UserAgents` ( | 3 | CREATE TABLE `UserAgents` ( |
4 | `ProfileID` varchar(255) NOT NULL, | 4 | `ProfileID` varchar(36) NOT NULL, |
5 | `AgentIP` varchar(24) default NULL, | 5 | `AgentIP` varchar(24) default NULL, |
6 | `AgentPort` int(11) default NULL, | 6 | `AgentPort` int(11) default NULL, |
7 | `AgentOnline` tinyint(1) default NULL, | 7 | `AgentOnline` tinyint(1) default NULL, |
8 | `SessionID` varchar(255) default NULL, | 8 | `SessionID` varchar(36) default NULL, |
9 | `SecureSessionID` varchar(255) default NULL, | 9 | `SecureSessionID` varchar(36) default NULL, |
10 | `InitialRegion` varchar(255) default NULL, | 10 | `InitialRegion` varchar(255) default NULL, |
11 | `Region` varchar(255) default NULL, | 11 | `Region` varchar(255) default NULL, |
12 | `LoginTime` int(11) default NULL, | 12 | `LoginTime` int(11) default NULL, |
@@ -15,16 +15,21 @@ CREATE TABLE `UserAgents` ( | |||
15 | `PositionX` float default NULL, | 15 | `PositionX` float default NULL, |
16 | `PositionY` float default NULL, | 16 | `PositionY` float default NULL, |
17 | `PositionZ` float default NULL, | 17 | `PositionZ` float default NULL, |
18 | `LookAtX` float default NULL, | ||
19 | `LookAtY` float default NULL, | ||
20 | `LookAtZ` float default NULL, | ||
18 | PRIMARY KEY (`ProfileID`) | 21 | PRIMARY KEY (`ProfileID`) |
19 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 22 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
20 | 23 | ||
21 | CREATE TABLE `UserProfiles` ( | 24 | CREATE TABLE `UserProfiles` ( |
22 | `ID` varchar(255) NOT NULL, | 25 | `ID` varchar(36) NOT NULL, |
26 | `WebLoginKey` varchar(36) default NULL, | ||
23 | `FirstName` varchar(32) default NULL, | 27 | `FirstName` varchar(32) default NULL, |
24 | `SurName` varchar(32) default NULL, | 28 | `SurName` varchar(32) default NULL, |
29 | `Email` varchar(250) default NULL, | ||
25 | `PasswordHash` varchar(32) default NULL, | 30 | `PasswordHash` varchar(32) default NULL, |
26 | `PasswordSalt` varchar(32) default NULL, | 31 | `PasswordSalt` varchar(32) default NULL, |
27 | `WebLoginKey` varchar(255) default NULL, | 32 | `HomeRegionID` varchar(36) default NULL, |
28 | `HomeRegionX` int(11) default NULL, | 33 | `HomeRegionX` int(11) default NULL, |
29 | `HomeRegionY` int(11) default NULL, | 34 | `HomeRegionY` int(11) default NULL, |
30 | `HomeLocationX` float default NULL, | 35 | `HomeLocationX` float default NULL, |
@@ -35,50 +40,67 @@ CREATE TABLE `UserProfiles` ( | |||
35 | `HomeLookAtZ` float default NULL, | 40 | `HomeLookAtZ` float default NULL, |
36 | `Created` int(11) default NULL, | 41 | `Created` int(11) default NULL, |
37 | `LastLogin` int(11) default NULL, | 42 | `LastLogin` int(11) default NULL, |
38 | `RootInventoryFolderID` varchar(255) default NULL, | ||
39 | `UserInventoryURI` varchar(255) default NULL, | 43 | `UserInventoryURI` varchar(255) default NULL, |
40 | `UserAssetURI` varchar(255) default NULL, | 44 | `UserAssetURI` varchar(255) default NULL, |
41 | `Image` varchar(255) default NULL, | 45 | `Image` varchar(36) default NULL, |
42 | `FirstLifeImage` varchar(255) default NULL, | 46 | `FirstLifeImage` varchar(36) default NULL, |
43 | `AboutText` varchar(255) default NULL, | 47 | `AboutText` text default NULL, |
44 | `FirstLifeAboutText` varchar(255) default NULL, | 48 | `FirstLifeAboutText` text default NULL, |
49 | `CanDoMask` int(11) default NULL, | ||
50 | `WantDoMask` int(11) default NULL, | ||
51 | `UserFlags` int(11) default NULL, | ||
52 | `GodLevel` int(11) default NULL, | ||
53 | `CustomType` varchar(32) default NULL, | ||
54 | `Partner` varchar(36) default NULL, | ||
55 | `RootInventoryFolderID` varchar(36) default NULL, | ||
45 | PRIMARY KEY (`ID`), | 56 | PRIMARY KEY (`ID`), |
46 | KEY `user_surname` (`SurName`), | 57 | INDEX `UserSurnameIndex` (`SurName`), |
47 | KEY `user_firstname` (`FirstName`) | 58 | INDEX `UserFirstNameIndex` (`FirstName`), |
59 | UNIQUE INDEX `UserFullNameIndex` (`SurName`,`FirstName`) | ||
48 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 60 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
49 | 61 | ||
50 | CREATE TABLE `UserAppearances` ( | 62 | CREATE TABLE `UserAppearances` ( |
51 | `Owner` varchar(255) NOT NULL, | 63 | `Owner` varchar(36) NOT NULL, |
52 | `BodyItem` varchar(255) default NULL, | 64 | `BodyItem` varchar(36) default NULL, |
53 | `BodyAsset` varchar(255) default NULL, | 65 | `BodyAsset` varchar(36) default NULL, |
54 | `SkinItem` varchar(255) default NULL, | 66 | `SkinItem` varchar(36) default NULL, |
55 | `SkinAsset` varchar(255) default NULL, | 67 | `SkinAsset` varchar(36) default NULL, |
56 | `HairItem` varchar(255) default NULL, | 68 | `HairItem` varchar(36) default NULL, |
57 | `HairAsset` varchar(255) default NULL, | 69 | `HairAsset` varchar(36) default NULL, |
58 | `EyesItem` varchar(255) default NULL, | 70 | `EyesItem` varchar(36) default NULL, |
59 | `EyesAsset` varchar(255) default NULL, | 71 | `EyesAsset` varchar(36) default NULL, |
60 | `ShirtItem` varchar(255) default NULL, | 72 | `ShirtItem` varchar(36) default NULL, |
61 | `ShirtAsset` varchar(255) default NULL, | 73 | `ShirtAsset` varchar(36) default NULL, |
62 | `PantsItem` varchar(255) default NULL, | 74 | `PantsItem` varchar(36) default NULL, |
63 | `PantsAsset` varchar(255) default NULL, | 75 | `PantsAsset` varchar(36) default NULL, |
64 | `ShoesItem` varchar(255) default NULL, | 76 | `ShoesItem` varchar(36) default NULL, |
65 | `ShoesAsset` varchar(255) default NULL, | 77 | `ShoesAsset` varchar(36) default NULL, |
66 | `SocksItem` varchar(255) default NULL, | 78 | `SocksItem` varchar(36) default NULL, |
67 | `SocksAsset` varchar(255) default NULL, | 79 | `SocksAsset` varchar(36) default NULL, |
68 | `JacketItem` varchar(255) default NULL, | 80 | `JacketItem` varchar(36) default NULL, |
69 | `JacketAsset` varchar(255) default NULL, | 81 | `JacketAsset` varchar(36) default NULL, |
70 | `GlovesItem` varchar(255) default NULL, | 82 | `GlovesItem` varchar(36) default NULL, |
71 | `GlovesAsset` varchar(255) default NULL, | 83 | `GlovesAsset` varchar(36) default NULL, |
72 | `UnderShirtItem` varchar(255) default NULL, | 84 | `UnderShirtItem` varchar(36) default NULL, |
73 | `UnderShirtAsset` varchar(255) default NULL, | 85 | `UnderShirtAsset` varchar(36) default NULL, |
74 | `UnderPantsItem` varchar(255) default NULL, | 86 | `UnderPantsItem` varchar(36) default NULL, |
75 | `UnderPantsAsset` varchar(255) default NULL, | 87 | `UnderPantsAsset` varchar(36) default NULL, |
76 | `SkirtItem` varchar(255) default NULL, | 88 | `SkirtItem` varchar(36) default NULL, |
77 | `SkirtAsset` varchar(255) default NULL, | 89 | `SkirtAsset` varchar(36) default NULL, |
78 | `Texture` longblob, | 90 | `Texture` longblob, |
79 | `VisualParams` longblob, | 91 | `VisualParams` longblob, |
80 | `Serial` int(11) default NULL, | 92 | `Serial` int(11) default NULL, |
93 | `AvatarHeight` float default NULL, | ||
81 | PRIMARY KEY (`Owner`) | 94 | PRIMARY KEY (`Owner`) |
82 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 95 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
83 | 96 | ||
84 | COMMIT; \ No newline at end of file | 97 | CREATE TABLE `UserFriends` ( |
98 | `UserFriendID` VARCHAR(36) NOT NULL, | ||
99 | `OwnerID` VARCHAR(36) NOT NULL, | ||
100 | `FriendID` VARCHAR(36) NOT NULL, | ||
101 | `FriendPermissions` INT(11) NOT NULL, | ||
102 | PRIMARY KEY (`UserFriendID`), | ||
103 | UNIQUE INDEX (`OwnerID`,`FriendID`) | ||
104 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | ||
105 | |||
106 | COMMIT; | ||
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql index 230e93c..e30287b 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/003_RegionStore.sql | |||
@@ -1,26 +1,78 @@ | |||
1 | BEGIN; | 1 | BEGIN; |
2 | 2 | ||
3 | CREATE TABLE `PrimItems` ( | 3 | CREATE TABLE `PrimItems` ( |
4 | `ItemID` char(36) NOT NULL default '', | ||
5 | `GroupID` char(36) default NULL, | ||
6 | `PrimID` char(36) default NULL, | ||
7 | `ParentFolderID` char(36) default NULL, | ||
8 | `AssetID` char(36) default NULL, | ||
9 | `OwnerID` char(36) default NULL, | ||
10 | `LastOwnerID` char(36) default NULL, | ||
11 | `CreatorID` char(36) default NULL, | ||
12 | `CreationDate` bigint(20) default NULL, | ||
4 | `InvType` int(11) default NULL, | 13 | `InvType` int(11) default NULL, |
5 | `Name` varchar(255) default NULL, | 14 | `Name` varchar(255) default NULL, |
6 | `Description` varchar(255) default NULL, | 15 | `Description` varchar(255) default NULL, |
7 | `CreationDate` bigint(20) default NULL, | ||
8 | `NextPermissions` int(11) default NULL, | 16 | `NextPermissions` int(11) default NULL, |
9 | `CurrentPermissions` int(11) default NULL, | 17 | `CurrentPermissions` int(11) default NULL, |
10 | `BasePermissions` int(11) default NULL, | 18 | `BasePermissions` int(11) default NULL, |
11 | `EveryonePermissions` int(11) default NULL, | 19 | `EveryonePermissions` int(11) default NULL, |
12 | `GroupPermissions` int(11) default NULL, | 20 | `GroupPermissions` int(11) default NULL, |
13 | `Flags` int(11) NOT NULL default '0', | 21 | `Flags` int(11) NOT NULL default '0', |
14 | `ItemID` char(36) NOT NULL default '', | ||
15 | `PrimID` char(36) default NULL, | ||
16 | `AssetID` char(36) default NULL, | ||
17 | `ParentFolderID` char(36) default NULL, | ||
18 | `CreatorID` char(36) default NULL, | ||
19 | `OwnerID` char(36) default NULL, | ||
20 | `GroupID` char(36) default NULL, | ||
21 | `LastOwnerID` char(36) default NULL, | ||
22 | PRIMARY KEY (`ItemID`), | 22 | PRIMARY KEY (`ItemID`), |
23 | KEY `primitems_primid` (`PrimID`) | 23 | KEY `primitems_primid` (`PrimID`) |
24 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 24 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
25 | 25 | ||
26 | COMMIT; \ No newline at end of file | 26 | CREATE TABLE RegionSettings ( |
27 | `RegionID` char(36) default NULL, | ||
28 | |||
29 | `BlockTerraform` bit(1) default NULL, | ||
30 | `BlockFly` bit(1) default NULL, | ||
31 | `AllowDamage` bit(1) default NULL, | ||
32 | `RestrictPushing` bit(1) default NULL, | ||
33 | `AllowLandResell` bit(1) default NULL, | ||
34 | `AllowLandJoinDivide` bit(1) default NULL, | ||
35 | `BlockShowInSearch` bit(1) default NULL, | ||
36 | |||
37 | `AgentLimit` int(11) default NULL, | ||
38 | `ObjectBonus` double default NULL, | ||
39 | `Maturity` int(11) default NULL, | ||
40 | |||
41 | `DisableScripts` bit(1) default NULL, | ||
42 | `DisableCollisions` bit(1) default NULL, | ||
43 | `DisablePhysics` bit(1) default NULL, | ||
44 | |||
45 | `TerrainTexture1` char(36) default NULL, | ||
46 | `TerrainTexture2` char(36) default NULL, | ||
47 | `TerrainTexture3` char(36) default NULL, | ||
48 | `TerrainTexture4` char(36) default NULL, | ||
49 | |||
50 | `Elevation1NW` double default NULL, | ||
51 | `Elevation2NW` double default NULL, | ||
52 | `Elevation1NE` double default NULL, | ||
53 | `Elevation2NE` double default NULL, | ||
54 | `Elevation1SE` double default NULL, | ||
55 | `Elevation2SE` double default NULL, | ||
56 | `Elevation1SW` double default NULL, | ||
57 | `Elevation2SW` double default NULL, | ||
58 | |||
59 | `WaterHeight` double default NULL, | ||
60 | `TerrainRaiseLimit` double default NULL, | ||
61 | `TerrainLowerLimit` double default NULL, | ||
62 | |||
63 | `UseEstateSun` bit(1) default NULL, | ||
64 | `Sandbox` bit(1) default NULL, | ||
65 | |||
66 | `SunVectorX` double default NULL, | ||
67 | `SunVectorY` double default NULL, | ||
68 | `SunVectorZ` double default NULL, | ||
69 | |||
70 | `FixedSun` bit(1) default NULL, | ||
71 | `SunPosition` double default NULL, | ||
72 | |||
73 | `Covenant` char(36) default NULL, | ||
74 | |||
75 | PRIMARY KEY (RegionID) | ||
76 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | ||
77 | |||
78 | COMMIT; | ||