diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs new file mode 100644 index 0000000000..b040ca7d1a --- /dev/null +++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs @@ -0,0 +1,107 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Data; +using libsecondlife; +using NHibernate; +using NHibernate.SqlTypes; +using NHibernate.UserTypes; + +namespace OpenSim.Data.NHibernate +{ + [Serializable] + public class LLVector3UserType: IUserType + { + public object Assemble(object cached, object owner) + { + return cached; + } + + bool IUserType.Equals(object vector1, object vector2) + { + return vector1.Equals(vector2); + } + + public object DeepCopy(object vector) + { + return new LLVector3((LLVector3) vector); + } + + public object Disassemble(object vector) + { + return vector; + } + + public int GetHashCode(object vector) + { + return (vector == null) ? 0 : vector.GetHashCode(); + } + + public bool IsMutable + { + get { return false; } + } + + public object NullSafeGet(IDataReader rs, string[] names, object owner) + { + object vector = null; + + int x = rs.GetOrdinal(names[0]); + int y = rs.GetOrdinal(names[1]); + int z = rs.GetOrdinal(names[2]); + if (!rs.IsDBNull(x)) + { + vector = new LLVector3((Single)rs[x], (Single)rs[y], (Single)rs[z]); + } + return vector; + } + + public void NullSafeSet(IDbCommand cmd, object obj, int index) + { + LLVector3 vector = (LLVector3)obj; + ((IDataParameter)cmd.Parameters[index]).Value = vector.X; + ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y; + ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z; + } + + public object Replace(object original, object target, object owner) + { + return original; + } + + public Type ReturnedType + { + get { return typeof(LLVector3); } + } + + public SqlType[] SqlTypes + { + get { return new SqlType [] { NHibernateUtil.Single.SqlType, NHibernateUtil.Single.SqlType, NHibernateUtil.Single.SqlType }; } + } + } +} diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml new file mode 100644 index 0000000000..17f7a4968f --- /dev/null +++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs index 18a8166750..dac7c75432 100644 --- a/OpenSim/Data/NHibernate/TextureUserType.cs +++ b/OpenSim/Data/NHibernate/TextureUserType.cs @@ -95,7 +95,7 @@ namespace OpenSim.Data.NHibernate public Type ReturnedType { - get { return typeof(LLUUID); } + get { return typeof(LLObject.TextureEntry); } } public SqlType[] SqlTypes