aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorSean Dague2008-07-03 16:37:44 +0000
committerSean Dague2008-07-03 16:37:44 +0000
commitb9bba13c39bc4e22886631d24865ca6274b1137b (patch)
tree4b9ff8ee57bbf3be7f38e0e33d53417518cd8315 /OpenSim/Data
parentMantis#1654. Thank you kindly, Matth for a patch that: (diff)
downloadopensim-SC_OLD-b9bba13c39bc4e22886631d24865ca6274b1137b.zip
opensim-SC_OLD-b9bba13c39bc4e22886631d24865ca6274b1137b.tar.gz
opensim-SC_OLD-b9bba13c39bc4e22886631d24865ca6274b1137b.tar.bz2
opensim-SC_OLD-b9bba13c39bc4e22886631d24865ca6274b1137b.tar.xz
playing with multicolumn mapping of vectors using a custom type
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/NHibernate/LLVector3UserType.cs107
-rw-r--r--OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml62
-rw-r--r--OpenSim/Data/NHibernate/TextureUserType.cs2
3 files changed, 170 insertions, 1 deletions
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
new file mode 100644
index 0000000..b040ca7d
--- /dev/null
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -0,0 +1,107 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Data;
30using libsecondlife;
31using NHibernate;
32using NHibernate.SqlTypes;
33using NHibernate.UserTypes;
34
35namespace OpenSim.Data.NHibernate
36{
37 [Serializable]
38 public class LLVector3UserType: IUserType
39 {
40 public object Assemble(object cached, object owner)
41 {
42 return cached;
43 }
44
45 bool IUserType.Equals(object vector1, object vector2)
46 {
47 return vector1.Equals(vector2);
48 }
49
50 public object DeepCopy(object vector)
51 {
52 return new LLVector3((LLVector3) vector);
53 }
54
55 public object Disassemble(object vector)
56 {
57 return vector;
58 }
59
60 public int GetHashCode(object vector)
61 {
62 return (vector == null) ? 0 : vector.GetHashCode();
63 }
64
65 public bool IsMutable
66 {
67 get { return false; }
68 }
69
70 public object NullSafeGet(IDataReader rs, string[] names, object owner)
71 {
72 object vector = null;
73
74 int x = rs.GetOrdinal(names[0]);
75 int y = rs.GetOrdinal(names[1]);
76 int z = rs.GetOrdinal(names[2]);
77 if (!rs.IsDBNull(x))
78 {
79 vector = new LLVector3((Single)rs[x], (Single)rs[y], (Single)rs[z]);
80 }
81 return vector;
82 }
83
84 public void NullSafeSet(IDbCommand cmd, object obj, int index)
85 {
86 LLVector3 vector = (LLVector3)obj;
87 ((IDataParameter)cmd.Parameters[index]).Value = vector.X;
88 ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y;
89 ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z;
90 }
91
92 public object Replace(object original, object target, object owner)
93 {
94 return original;
95 }
96
97 public Type ReturnedType
98 {
99 get { return typeof(LLVector3); }
100 }
101
102 public SqlType[] SqlTypes
103 {
104 get { return new SqlType [] { NHibernateUtil.Single.SqlType, NHibernateUtil.Single.SqlType, NHibernateUtil.Single.SqlType }; }
105 }
106 }
107}
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
new file mode 100644
index 0000000..17f7a49
--- /dev/null
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -0,0 +1,62 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
3 <class name="OpenSim.Region.Environment.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false">
4 <id name="UUID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" />
6 </id>
7 <property name="ParentID" type="System.UInt32" />
8 <property name="CreationDate" type="System.Int32" />
9 <property name="Name" type="String" length="255" />
10 <property name="Text" type="String" length="255" />
11 <property name="Description" type="String" length="255" />
12 <property name="SitName" type="String" length="255" />
13 <property name="TouchName" type="String" length="255" />
14
15 <property name="ObjectFlags" type="System.UInt32" />
16 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
17 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
18 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
19 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
20
21 <property name="OwnerMask" type="System.UInt32" />
22 <property name="NextOwnerMask" type="System.UInt32" />
23 <property name="GroupMask" type="System.UInt32" />
24 <property name="EveryoneMask" type="System.UInt32" />
25 <property name="BaseMask" type="System.UInt32" />
26
27 <property name="OffsetPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
28 <column name="PositionX" />
29 <column name="PositionY" />
30 <column name="PositionZ" />
31 </property>
32
33 <property name="GroupPosition.X" column="GroupPositionX" type="Single" />
34 <property name="GroupPosition.Y" column="GroupPositionY" type="Single" />
35 <property name="GroupPosition.Z" column="GroupPositionZ" type="Single" />
36
37 <property name="Velocity.X" column="VelocityX" type="Single" />
38 <property name="Velocity.Y" column="VelocityY" type="Single" />
39 <property name="Velocity.Z" column="VelocityZ" type="Single" />
40
41 <property name="AngularVelocity.X" column="AngularVelocityX" type="Single" />
42 <property name="AngularVelocity.Y" column="AngularVelocityY" type="Single" />
43 <property name="AngularVelocity.Z" column="AngularVelocityZ" type="Single" />
44
45 <property name="Acceleration.X" column="AccelerationX" type="Single" />
46 <property name="Acceleration.Y" column="AccelerationY" type="Single" />
47 <property name="Acceleration.Z" column="AccelerationZ" type="Single" />
48
49 <property name="Rotation.X" column="RotationX" type="Single" />
50 <property name="Rotation.Y" column="RotationY" type="Single" />
51 <property name="Rotation.Z" column="RotationZ" type="Single" />
52 <property name="Rotation.W" column="RotationW" type="Single" />
53
54 <property name="sitTargetPos.X" column="sitTargetPosX" type="Single" />
55 <property name="sitTargetPos.Y" column="sitTargetPosY" type="Single" />
56 <property name="sitTargetPos.Z" column="sitTargetPosZ" type="Single" />
57 <property name="SiteTargetOrient.X" column="SiteTargetOrientX" type="Single" />
58 <property name="SiteTargetOrient.Y" column="SiteTargetOrientY" type="Single" />
59 <property name="SiteTargetOrient.Z" column="SiteTargetOrientZ" type="Single" />
60 <property name="SiteTargetOrient.W" column="SiteTargetOrientW" type="Single" />
61 </class>
62</hibernate-mapping> \ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index 18a8166..dac7c75 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Data.NHibernate
95 95
96 public Type ReturnedType 96 public Type ReturnedType
97 { 97 {
98 get { return typeof(LLUUID); } 98 get { return typeof(LLObject.TextureEntry); }
99 } 99 }
100 100
101 public SqlType[] SqlTypes 101 public SqlType[] SqlTypes