[Nhibernate-commit] nhibernate/src/NHibernate/Type AnsiStringType.cs,1.1,1.2 BooleanType.cs,1.5,1.6 ByteType.cs,1.4,1.5 CharBooleanType.cs,1.4,1.5 CharType.cs,1.1,1.2 DateTimeType.cs,1.5,1.6 DateType.cs,1.7,1.8 DecimalType.cs,1.2,1.3 DoubleType.cs,1.3,1.4 GuidType.cs,1.1,1.2 Int16Type.cs,1.1,1.2 Int32Type.cs,1.2,1.3 Int64Type.cs,1.1,1.2 SingleType.cs,1.2,1.3 StringType.cs,1.3,1.4 TicksType.cs,1.2,1.3 TimeSpanType.cs,1.2,1.3 TimestampType.cs,1.4,1.5 TimeType.cs,1.3,1.4

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27265/NHibernate/Type

Modified Files:
	AnsiStringType.cs BooleanType.cs ByteType.cs 
	CharBooleanType.cs CharType.cs DateTimeType.cs DateType.cs 
	DecimalType.cs DoubleType.cs GuidType.cs Int16Type.cs 
	Int32Type.cs Int64Type.cs SingleType.cs StringType.cs 
	TicksType.cs TimeSpanType.cs TimestampType.cs TimeType.cs 
Log Message:
Modified how values are read from the db in order to support Oracle.  Their 
driver does not support GetInt16 & GetInt32.  Thanks to feilng for pointing
that out and the contribution.

Index: TimeType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TimeType.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TimeType.cs	13 Apr 2004 14:49:25 -0000	1.3
--- TimeType.cs	18 May 2004 05:04:12 -0000	1.4
***************
*** 24,28 ****
  		public override object Get(IDataReader rs, int index) 
  		{
! 			DateTime dbValue = rs.GetDateTime(index);
  			return new DateTime(1, 1, 1, dbValue.Hour, dbValue.Minute, dbValue.Second);
  		}
--- 24,28 ----
  		public override object Get(IDataReader rs, int index) 
  		{
! 			DateTime dbValue = Convert.ToDateTime(rs[index]);
  			return new DateTime(1, 1, 1, dbValue.Hour, dbValue.Minute, dbValue.Second);
  		}
***************
*** 30,34 ****
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));// rs.[name];
  		}
  
--- 30,34 ----
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  

Index: ByteType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/ByteType.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ByteType.cs	10 Feb 2004 18:41:42 -0000	1.4
--- ByteType.cs	18 May 2004 05:04:12 -0000	1.5
***************
*** 16,24 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetByte(index);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  
--- 16,24 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return  Convert.ToByte(rs[index]); 
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToByte(rs[name]);
  		}
  

Index: DateType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/DateType.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DateType.cs	13 Apr 2004 14:49:25 -0000	1.7
--- DateType.cs	18 May 2004 05:04:12 -0000	1.8
***************
*** 14,18 ****
  	    public override object Get(IDataReader rs, int index) 
  		{
! 			DateTime dbValue = rs.GetDateTime(index);
  			return new DateTime(dbValue.Year, dbValue.Month, dbValue.Day);
  		}
--- 14,18 ----
  	    public override object Get(IDataReader rs, int index) 
  		{
! 			DateTime dbValue = Convert.ToDateTime(rs[index]);
  			return new DateTime(dbValue.Year, dbValue.Month, dbValue.Day);
  		}
***************
*** 20,24 ****
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));// rs.[name];
  		}
  
--- 20,24 ----
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  

Index: Int32Type.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/Int32Type.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Int32Type.cs	14 Apr 2004 14:40:51 -0000	1.2
--- Int32Type.cs	18 May 2004 05:04:12 -0000	1.3
***************
*** 12,20 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetInt32(index);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  
--- 12,20 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToInt32(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToInt32(rs[name]);
  		}
  

Index: Int16Type.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/Int16Type.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Int16Type.cs	10 Feb 2004 18:41:42 -0000	1.1
--- Int16Type.cs	18 May 2004 05:04:12 -0000	1.2
***************
*** 12,20 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetInt16(index);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  		public override System.Type PrimitiveClass {
--- 12,20 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToInt16(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToInt16(rs[name]);
  		}
  		public override System.Type PrimitiveClass {

Index: BooleanType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/BooleanType.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BooleanType.cs	21 Mar 2004 00:50:31 -0000	1.5
--- BooleanType.cs	18 May 2004 05:04:12 -0000	1.6
***************
*** 43,51 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetBoolean(index); 
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  
--- 43,51 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToBoolean(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToBoolean(rs[name]);
  		}
  

Index: DecimalType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/DecimalType.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DecimalType.cs	10 Feb 2004 18:41:42 -0000	1.2
--- DecimalType.cs	18 May 2004 05:04:12 -0000	1.3
***************
*** 15,23 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetDecimal(index);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  
--- 15,23 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToDecimal(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToDecimal(rs[name]);
  		}
  

Index: GuidType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/GuidType.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuidType.cs	14 Apr 2004 14:40:51 -0000	1.1
--- GuidType.cs	18 May 2004 05:04:12 -0000	1.2
***************
*** 16,25 ****
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return rs.GetGuid(index);
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  
--- 16,25 ----
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return new Guid( Convert.ToString(rs[index]) );
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return new Guid( Convert.ToString(rs[name]) );
  		}
  

Index: AnsiStringType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/AnsiStringType.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AnsiStringType.cs	30 Apr 2004 18:39:46 -0000	1.1
--- AnsiStringType.cs	18 May 2004 05:04:12 -0000	1.2
***************
*** 16,25 ****
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return rs.GetString(index);
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  		public override System.Type ReturnedClass 
--- 16,25 ----
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return Convert.ToString(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Convert.ToString(rs[name]);
  		}
  		public override System.Type ReturnedClass 

Index: TimestampType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TimestampType.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TimestampType.cs	13 Apr 2004 14:49:25 -0000	1.4
--- TimestampType.cs	18 May 2004 05:04:12 -0000	1.5
***************
*** 37,46 ****
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return rs.GetDateTime(index);
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));// rs.[name];
  		}
  
--- 37,46 ----
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return Convert.ToDateTime(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  

Index: DateTimeType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/DateTimeType.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DateTimeType.cs	13 Apr 2004 14:49:24 -0000	1.5
--- DateTimeType.cs	18 May 2004 05:04:12 -0000	1.6
***************
*** 25,29 ****
  		public override object Get(IDataReader rs, int index) 
  		{
! 			DateTime dbValue = rs.GetDateTime(index);
  			return new DateTime(dbValue.Year, dbValue.Month, dbValue.Day, dbValue.Hour, dbValue.Minute, dbValue.Second);
  		}
--- 25,29 ----
  		public override object Get(IDataReader rs, int index) 
  		{
! 			DateTime dbValue = Convert.ToDateTime(rs[index]); 
  			return new DateTime(dbValue.Year, dbValue.Month, dbValue.Day, dbValue.Hour, dbValue.Minute, dbValue.Second);
  		}

Index: TicksType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TicksType.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TicksType.cs	17 Feb 2004 03:30:39 -0000	1.2
--- TicksType.cs	18 May 2004 05:04:12 -0000	1.3
***************
*** 24,33 ****
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return new DateTime(rs.GetInt64(index));
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));// rs.[name];
  		}
  
--- 24,33 ----
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return new DateTime( Convert.ToInt64(rs[index]) );
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  

Index: StringType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/StringType.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringType.cs	10 Feb 2004 18:41:42 -0000	1.3
--- StringType.cs	18 May 2004 05:04:12 -0000	1.4
***************
*** 17,25 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetString(index);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  		public override System.Type ReturnedClass {
--- 17,25 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToString(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToString(rs[name]);
  		}
  		public override System.Type ReturnedClass {

Index: DoubleType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/DoubleType.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DoubleType.cs	10 Feb 2004 18:41:42 -0000	1.3
--- DoubleType.cs	18 May 2004 05:04:12 -0000	1.4
***************
*** 12,20 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetDouble(index);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  
--- 12,20 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToDouble(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToDouble(rs[name]);
  		}
  

Index: SingleType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/SingleType.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SingleType.cs	17 Feb 2004 03:31:40 -0000	1.2
--- SingleType.cs	18 May 2004 05:04:12 -0000	1.3
***************
*** 23,32 ****
  		public override object Get(IDataReader rs, int index)
  		{
! 			return rs.GetFloat(index);
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  
--- 23,32 ----
  		public override object Get(IDataReader rs, int index)
  		{
! 			return Convert.ToSingle(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Convert.ToSingle(rs[name]);
  		}
  

Index: TimeSpanType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/TimeSpanType.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TimeSpanType.cs	30 Apr 2004 16:24:23 -0000	1.2
--- TimeSpanType.cs	18 May 2004 05:04:12 -0000	1.3
***************
*** 19,28 ****
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return new TimeSpan(rs.GetInt64(index));
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));// rs.[name];
  		}
  
--- 19,28 ----
  		public override object Get(IDataReader rs, int index) 
  		{
! 			return new TimeSpan( Convert.ToInt64(rs[index]) );
  		}
  
  		public override object Get(IDataReader rs, string name) 
  		{
! 			return Get(rs, rs.GetOrdinal(name));
  		}
  

Index: Int64Type.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/Int64Type.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Int64Type.cs	10 Feb 2004 18:41:42 -0000	1.1
--- Int64Type.cs	18 May 2004 05:04:12 -0000	1.2
***************
*** 12,20 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			return rs.GetInt64(index);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Get(rs, rs.GetOrdinal(name));// rs.[name];
  		}
  
--- 12,20 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			return Convert.ToInt64(rs[index]);
  		}
  
  		public override object Get(IDataReader rs, string name) {
! 			return Convert.ToInt64(rs[name]);
  		}
  

Index: CharBooleanType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/CharBooleanType.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CharBooleanType.cs	10 Feb 2004 18:41:42 -0000	1.4
--- CharBooleanType.cs	18 May 2004 05:04:12 -0000	1.5
***************
*** 19,23 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			string code = rs.GetString(index);
  			if (code==null) {
  				return null;
--- 19,23 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			string code = Convert.ToString(rs[index]);
  			if (code==null) {
  				return null;

Index: CharType.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Type/CharType.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CharType.cs	8 Apr 2004 15:55:46 -0000	1.1
--- CharType.cs	18 May 2004 05:04:12 -0000	1.2
***************
*** 16,25 ****
  
  		public override object Get(IDataReader rs, int index) {
! 			string str = rs.GetString(index);
! 			if (str==null) {
  				return null;
  			}
  			else {
! 				return str[0];
  			}	
  		}
--- 16,25 ----
  
  		public override object Get(IDataReader rs, int index) {
! 			string dbValue = Convert.ToString(rs[index]);
! 			if (dbValue==null) {
  				return null;
  			}
  			else {
! 				return dbValue[0];
  			}	
  		}