From: Donald L M. Jr. <lu...@us...> - 2005-01-26 21:34:15
|
Update of /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24286/src/Nullables.NHibernate Modified Files: NullableBooleanType.cs NullableByteType.cs NullableDateTimeType.cs NullableDecimalType.cs NullableDoubleType.cs NullableGuidType.cs NullableInt16Type.cs NullableInt32Type.cs NullableInt64Type.cs NullableSingleType.cs Log Message: Changed Get() to use Convert.To__() instead of a cast to handle certain (broken?) ADO.NET providers that return unexpexted types. NullableGuidType.Get() will also accept a string (for DB's that have no Guid type, like MySQL). Index: NullableInt64Type.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableInt64Type.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableInt64Type.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableInt64Type.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 62,66 **** else { ! return new NullableInt64((Int64)value); } } --- 62,66 ---- else { ! return new NullableInt64(Convert.ToInt64(value)); } } Index: NullableByteType.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableByteType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableByteType.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableByteType.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 61,65 **** else { ! return new NullableByte((Byte)value); } } --- 61,65 ---- else { ! return new NullableByte(Convert.ToByte(value)); } } Index: NullableSingleType.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableSingleType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableSingleType.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableSingleType.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 67,71 **** else { ! return new NullableSingle((Single)value); } } --- 67,71 ---- else { ! return new NullableSingle(Convert.ToSingle(value)); } } *************** *** 91,93 **** } } ! } --- 91,93 ---- } } ! } \ No newline at end of file Index: NullableDoubleType.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableDoubleType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableDoubleType.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableDoubleType.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 62,66 **** else { ! return new NullableDouble((Double)value); } } --- 62,66 ---- else { ! return new NullableDouble(Convert.ToDouble(value)); } } Index: NullableInt32Type.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableInt32Type.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableInt32Type.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableInt32Type.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 62,66 **** else { ! return new NullableInt32((Int32)value); } } --- 62,66 ---- else { ! return new NullableInt32(Convert.ToInt32(value)); } } Index: NullableDecimalType.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableDecimalType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableDecimalType.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableDecimalType.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 63,67 **** else { ! return new NullableDecimal((Decimal)value); } } --- 63,67 ---- else { ! return new NullableDecimal(Convert.ToDecimal(value)); } } Index: NullableDateTimeType.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableDateTimeType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableDateTimeType.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableDateTimeType.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 62,66 **** else { ! return new NullableDateTime((DateTime)value); } } --- 62,66 ---- else { ! return new NullableDateTime(Convert.ToDateTime(value)); } } Index: NullableBooleanType.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableBooleanType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableBooleanType.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableBooleanType.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 62,66 **** else { ! return new NullableBoolean((Boolean)value); } } --- 62,66 ---- else { ! return new NullableBoolean(Convert.ToBoolean(value)); } } Index: NullableInt16Type.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableInt16Type.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableInt16Type.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableInt16Type.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 62,66 **** else { ! return new NullableInt16((Int16)value); } } --- 62,66 ---- else { ! return new NullableInt16(Convert.ToInt16(value)); } } Index: NullableGuidType.cs =================================================================== RCS file: /cvsroot/nhibernate/NHibernateContrib/src/Nullables.NHibernate/NullableGuidType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NullableGuidType.cs 26 Jan 2005 21:23:53 -0000 1.2 --- NullableGuidType.cs 26 Jan 2005 21:34:03 -0000 1.3 *************** *** 60,67 **** return NullableGuid.Default; } ! else { return new NullableGuid((Guid)value); } } --- 60,71 ---- return NullableGuid.Default; } ! else if (value is Guid) { return new NullableGuid((Guid)value); } + else + { + return new NullableGuid(new Guid(value.ToString())); //certain DB's that have no Guid (MySQL) will return strings. + } } |