Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20304/NHibernate/Type
Modified Files:
PersistentEnumType.cs
Log Message:
Added test for PersistentEnumType to verify the change to Equals was valid.
Index: PersistentEnumType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/PersistentEnumType.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PersistentEnumType.cs 20 Apr 2004 17:37:02 -0000 1.5
--- PersistentEnumType.cs 28 Apr 2004 14:16:18 -0000 1.6
***************
*** 52,80 ****
}
- // protected DbType UnderlyingDbType { //Not overridable. These are the DbTypes.
- // get {
- // switch( Enum.GetUnderlyingType(enumClass).FullName ) {
- // case "System.Byte":
- // return DbType.Byte;
- // case "System.Int16":
- // return DbType.Int16;
- // case "System.Int32":
- // return DbType.Int32;
- // case "System.Int64":
- // return DbType.Int64;
- // case "System.SByte":
- // return DbType.SByte;
- // case "System.UInt16":
- // return DbType.UInt16;
- // case "System.UInt32":
- // return DbType.UInt32;
- // case "System.UInt64":
- // return DbType.UInt64;
- // default:
- // throw new HibernateException( "Unknown UnderlyingDbType for Enum"); //Impossible exception
- // }
- // }
- // }
-
public virtual object GetInstance(object code) {
try {
--- 52,55 ----
***************
*** 113,117 ****
public override bool Equals(object x, object y) {
! return (x==y) || ( x!=null && y!=null && x.GetType()==y.GetType() && x.ToString()==y.ToString() );
}
--- 88,93 ----
public override bool Equals(object x, object y) {
! //return (x==y) || ( x!=null && y!=null && x.GetType()==y.GetType() && x.ToString()==y.ToString() );
! return (x==y) || ( x!=null && y!=null && x.Equals(y) ) ;
}
|
