diff options
author | Justin Clarke Casey | 2009-07-24 20:39:46 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-07-24 20:39:46 +0000 |
commit | 98687df56b00c252cae4aacafd364c8dd8c4fe17 (patch) | |
tree | b4d65009e086b9a254df12653457176e51719347 /OpenSim/Data | |
parent | * minor: spacing adjustment to retrigger panda (diff) | |
download | opensim-SC_OLD-98687df56b00c252cae4aacafd364c8dd8c4fe17.zip opensim-SC_OLD-98687df56b00c252cae4aacafd364c8dd8c4fe17.tar.gz opensim-SC_OLD-98687df56b00c252cae4aacafd364c8dd8c4fe17.tar.bz2 opensim-SC_OLD-98687df56b00c252cae4aacafd364c8dd8c4fe17.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=3586
* Make MSSQL current in NHibernate
* Thanks mpallari
Diffstat (limited to '')
3 files changed, 88 insertions, 1 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql new file mode 100644 index 0000000..dfaac6e --- /dev/null +++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_RegionStore.sql | |||
@@ -0,0 +1,51 @@ | |||
1 | ALTER TABLE Prims ADD LinkNum INT null; | ||
2 | ALTER TABLE Prims ADD Material TINYINT null; | ||
3 | ALTER TABLE Prims ADD ScriptAccessPin INT null; | ||
4 | ALTER TABLE Prims ADD TextureAnimation VARBINARY(max) null; | ||
5 | ALTER TABLE Prims ADD ParticleSystem VARBINARY(max) null; | ||
6 | ALTER TABLE Prims ADD ClickAction TINYINT null; | ||
7 | ALTER TABLE Prims ADD Color INT null; | ||
8 | |||
9 | CREATE TABLE RegionSettings | ||
10 | ( | ||
11 | RegionID NVARCHAR(255) NOT NULL, | ||
12 | BlockTerraform bit NOT NULL, | ||
13 | BlockFly bit NOT NULL, | ||
14 | AllowDamage bit NOT NULL, | ||
15 | RestrictPushing bit NOT NULL, | ||
16 | AllowLandResell bit NOT NULL, | ||
17 | AllowLandJoinDivide bit NOT NULL, | ||
18 | BlockShowInSearch bit NOT NULL, | ||
19 | AgentLimit int NOT NULL, | ||
20 | ObjectBonus float(53) NOT NULL, | ||
21 | Maturity int NOT NULL, | ||
22 | DisableScripts bit NOT NULL, | ||
23 | DisableCollisions bit NOT NULL, | ||
24 | DisablePhysics bit NOT NULL, | ||
25 | TerrainTexture1 NVARCHAR(36) NOT NULL, | ||
26 | TerrainTexture2 NVARCHAR(36) NOT NULL, | ||
27 | TerrainTexture3 NVARCHAR(36) NOT NULL, | ||
28 | TerrainTexture4 NVARCHAR(36) NOT NULL, | ||
29 | Elevation1NW float(53) NOT NULL, | ||
30 | Elevation2NW float(53) NOT NULL, | ||
31 | Elevation1NE float(53) NOT NULL, | ||
32 | Elevation2NE float(53) NOT NULL, | ||
33 | Elevation1SE float(53) NOT NULL, | ||
34 | Elevation2SE float(53) NOT NULL, | ||
35 | Elevation1SW float(53) NOT NULL, | ||
36 | Elevation2SW float(53) NOT NULL, | ||
37 | WaterHeight float(53) NOT NULL, | ||
38 | TerrainRaiseLimit float(53) NOT NULL, | ||
39 | TerrainLowerLimit float(53) NOT NULL, | ||
40 | UseEstateSun bit NOT NULL, | ||
41 | FixedSun bit NOT NULL, | ||
42 | SunPosition float(53) NOT NULL, | ||
43 | Covenant NVARCHAR(36) NULL DEFAULT (NULL), | ||
44 | Sandbox bit NOT NULL, | ||
45 | SunVectorX float(53) NOT NULL DEFAULT ((0)), | ||
46 | SunVectorY float(53) NOT NULL DEFAULT ((0)), | ||
47 | SunVectorZ float(53) NOT NULL DEFAULT ((0)), | ||
48 | |||
49 | primary key (RegionID) | ||
50 | ) | ||
51 | |||
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql new file mode 100644 index 0000000..f5e0c00 --- /dev/null +++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/002_UserStore.sql | |||
@@ -0,0 +1,27 @@ | |||
1 | ALTER TABLE UserAgents ADD PositionX REAL null; | ||
2 | ALTER TABLE UserAgents ADD PositionY REAL null; | ||
3 | ALTER TABLE UserAgents ADD PositionZ REAL null; | ||
4 | ALTER TABLE UserAgents ADD LookAtX REAL null; | ||
5 | ALTER TABLE UserAgents ADD LookAtY REAL null; | ||
6 | ALTER TABLE UserAgents ADD LookAtZ REAL null; | ||
7 | |||
8 | ALTER TABLE UserProfiles ADD Email NVARCHAR(250) null; | ||
9 | ALTER TABLE UserProfiles ADD HomeRegionID NVARCHAR(36) null; | ||
10 | ALTER TABLE UserProfiles ADD CanDoMask INT null; | ||
11 | ALTER TABLE UserProfiles ADD WantDoMask INT null; | ||
12 | ALTER TABLE UserProfiles ADD UserFlags INT null; | ||
13 | ALTER TABLE UserProfiles ADD GodLevel INT null; | ||
14 | ALTER TABLE UserProfiles ADD CustomType NVARCHAR(32) null; | ||
15 | ALTER TABLE UserProfiles ADD Partner NVARCHAR(36) null; | ||
16 | |||
17 | ALTER TABLE UserAppearances ADD AvatarHeight FLOAT null; | ||
18 | |||
19 | CREATE TABLE UserFriends ( | ||
20 | UserFriendID NVARCHAR(36) NOT NULL, | ||
21 | OwnerID NVARCHAR(36) NULL, | ||
22 | FriendID NVARCHAR(36) NULL, | ||
23 | FriendPermissions INT NULL, | ||
24 | PRIMARY KEY (UserFriendID) | ||
25 | ); | ||
26 | |||
27 | CREATE INDEX UserFriendsOwnerIdFriendIdIndex ON UserFriends (OwnerID,FriendID); | ||
diff --git a/OpenSim/Data/NHibernate/SByteType.cs b/OpenSim/Data/NHibernate/SByteType.cs index b2bbe74..92ab0ba 100644 --- a/OpenSim/Data/NHibernate/SByteType.cs +++ b/OpenSim/Data/NHibernate/SByteType.cs | |||
@@ -73,7 +73,16 @@ namespace OpenSim.Data.NHibernate | |||
73 | int ord = rs.GetOrdinal(names[0]); | 73 | int ord = rs.GetOrdinal(names[0]); |
74 | if (!rs.IsDBNull(ord)) | 74 | if (!rs.IsDBNull(ord)) |
75 | { | 75 | { |
76 | sbyte1 = Convert.ToSByte(rs.GetInt16(ord)); | 76 | object tempO = rs.GetValue(ord); |
77 | if (tempO is Byte) | ||
78 | { | ||
79 | sbyte1 = Convert.ToSByte(((byte)tempO)); | ||
80 | } | ||
81 | else | ||
82 | { | ||
83 | short temp = rs.GetInt16(ord); | ||
84 | sbyte1 = Convert.ToSByte(temp); | ||
85 | } | ||
77 | } | 86 | } |
78 | return sbyte1; | 87 | return sbyte1; |
79 | } | 88 | } |