Skip to content

Commit 990cd6a

Browse files
author
Mike Doerfler
committed
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. SVN: trunk@525
1 parent e128fbd commit 990cd6a

19 files changed

+37
-37
lines changed

‎src/NHibernate/Type/AnsiStringType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ internal AnsiStringType(AnsiStringSqlType sqlType) : base(sqlType) {}
1515

1616
public override object Get(IDataReader rs, int index)
1717
{
18-
return rs.GetString(index);
18+
return Convert.ToString(rs[index]);
1919
}
2020

2121
public override object Get(IDataReader rs, string name)
2222
{
23-
return Get(rs, rs.GetOrdinal(name));
23+
return Convert.ToString(rs[name]);
2424
}
2525
public override System.Type ReturnedClass
2626
{

‎src/NHibernate/Type/BooleanType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ internal BooleanType(AnsiStringFixedLengthSqlType sqlType) : base(sqlType) {
4242
}
4343

4444
public override object Get(IDataReader rs, int index) {
45-
return rs.GetBoolean(index);
45+
return Convert.ToBoolean(rs[index]);
4646
}
4747

4848
public override object Get(IDataReader rs, string name) {
49-
return Get(rs, rs.GetOrdinal(name));
49+
return Convert.ToBoolean(rs[name]);
5050
}
5151

5252
public override System.Type PrimitiveClass {

‎src/NHibernate/Type/ByteType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ internal ByteType(ByteSqlType sqlType) : base(sqlType) {
1515
}
1616

1717
public override object Get(IDataReader rs, int index) {
18-
return rs.GetByte(index);
18+
return Convert.ToByte(rs[index]);
1919
}
2020

2121
public override object Get(IDataReader rs, string name) {
22-
return Get(rs, rs.GetOrdinal(name));
22+
return Convert.ToByte(rs[name]);
2323
}
2424

2525
public override System.Type PrimitiveClass {

‎src/NHibernate/Type/CharBooleanType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal CharBooleanType(AnsiStringFixedLengthSqlType sqlType) : base(sqlType) {
1818
}
1919

2020
public override object Get(IDataReader rs, int index) {
21-
string code = rs.GetString(index);
21+
string code = Convert.ToString(rs[index]);
2222
if (code==null) {
2323
return null;
2424
}

‎src/NHibernate/Type/CharType.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ internal CharType(StringFixedLengthSqlType sqlType) : base(sqlType) {
1515
}
1616

1717
public override object Get(IDataReader rs, int index) {
18-
string str = rs.GetString(index);
19-
if (str==null) {
18+
string dbValue = Convert.ToString(rs[index]);
19+
if (dbValue==null) {
2020
return null;
2121
}
2222
else {
23-
return str[0];
23+
return dbValue[0];
2424
}
2525
}
2626

‎src/NHibernate/Type/DateTimeType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public DateTimeType(DateTimeSqlType sqlType) : base(sqlType)
2424

2525
public override object Get(IDataReader rs, int index)
2626
{
27-
DateTime dbValue = rs.GetDateTime(index);
27+
DateTime dbValue = Convert.ToDateTime(rs[index]);
2828
return new DateTime(dbValue.Year, dbValue.Month, dbValue.Day, dbValue.Hour, dbValue.Minute, dbValue.Second);
2929
}
3030

‎src/NHibernate/Type/DateType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public DateType (DateSqlType sqlType) : base(sqlType)
1313

1414
public override object Get(IDataReader rs, int index)
1515
{
16-
DateTime dbValue = rs.GetDateTime(index);
16+
DateTime dbValue = Convert.ToDateTime(rs[index]);
1717
return new DateTime(dbValue.Year, dbValue.Month, dbValue.Day);
1818
}
1919

2020
public override object Get(IDataReader rs, string name)
2121
{
22-
return Get(rs, rs.GetOrdinal(name));// rs.[name];
22+
return Get(rs, rs.GetOrdinal(name));
2323
}
2424

2525
public override System.Type ReturnedClass {

‎src/NHibernate/Type/DecimalType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ internal DecimalType(DecimalSqlType sqlType) : base(sqlType) {
1414
}
1515

1616
public override object Get(IDataReader rs, int index) {
17-
return rs.GetDecimal(index);
17+
return Convert.ToDecimal(rs[index]);
1818
}
1919

2020
public override object Get(IDataReader rs, string name) {
21-
return Get(rs, rs.GetOrdinal(name));
21+
return Convert.ToDecimal(rs[name]);
2222
}
2323

2424
public override System.Type PrimitiveClass {

‎src/NHibernate/Type/DoubleType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ internal DoubleType(DoubleSqlType sqlType) : base(sqlType) {
1111
}
1212

1313
public override object Get(IDataReader rs, int index) {
14-
return rs.GetDouble(index);
14+
return Convert.ToDouble(rs[index]);
1515
}
1616

1717
public override object Get(IDataReader rs, string name) {
18-
return Get(rs, rs.GetOrdinal(name));
18+
return Convert.ToDouble(rs[name]);
1919
}
2020

2121
public override System.Type PrimitiveClass {

‎src/NHibernate/Type/GuidType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ internal GuidType(GuidSqlType sqlType) : base(sqlType)
1515

1616
public override object Get(IDataReader rs, int index)
1717
{
18-
return rs.GetGuid(index);
18+
return new Guid( Convert.ToString(rs[index]) );
1919
}
2020

2121
public override object Get(IDataReader rs, string name)
2222
{
23-
return Get(rs, rs.GetOrdinal(name));
23+
return new Guid( Convert.ToString(rs[name]) );
2424
}
2525

2626
public override System.Type PrimitiveClass

‎src/NHibernate/Type/Int16Type.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ internal Int16Type(Int16SqlType sqlType) : base(sqlType) {
1111
}
1212

1313
public override object Get(IDataReader rs, int index) {
14-
return rs.GetInt16(index);
14+
return Convert.ToInt16(rs[index]);
1515
}
1616

1717
public override object Get(IDataReader rs, string name) {
18-
return Get(rs, rs.GetOrdinal(name));
18+
return Convert.ToInt16(rs[name]);
1919
}
2020
public override System.Type PrimitiveClass {
2121
get { return typeof(System.Int16); }

‎src/NHibernate/Type/Int32Type.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ internal Int32Type(Int32SqlType sqlType) : base(sqlType) {
1111
}
1212

1313
public override object Get(IDataReader rs, int index) {
14-
return rs.GetInt32(index);
14+
return Convert.ToInt32(rs[index]);
1515
}
1616

1717
public override object Get(IDataReader rs, string name) {
18-
return Get(rs, rs.GetOrdinal(name));
18+
return Convert.ToInt32(rs[name]);
1919
}
2020

2121
public override System.Type PrimitiveClass {

‎src/NHibernate/Type/Int64Type.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ internal Int64Type(Int64SqlType sqlType) : base(sqlType) {
1111
}
1212

1313
public override object Get(IDataReader rs, int index) {
14-
return rs.GetInt64(index);
14+
return Convert.ToInt64(rs[index]);
1515
}
1616

1717
public override object Get(IDataReader rs, string name) {
18-
return Get(rs, rs.GetOrdinal(name));// rs.[name];
18+
return Convert.ToInt64(rs[name]);
1919
}
2020

2121
public override System.Type PrimitiveClass {

‎src/NHibernate/Type/SingleType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ internal SingleType(SingleSqlType sqlType) : base(sqlType)
2222

2323
public override object Get(IDataReader rs, int index)
2424
{
25-
return rs.GetFloat(index);
25+
return Convert.ToSingle(rs[index]);
2626
}
2727

2828
public override object Get(IDataReader rs, string name)
2929
{
30-
return Get(rs, rs.GetOrdinal(name));
30+
return Convert.ToSingle(rs[name]);
3131
}
3232

3333
public override System.Type PrimitiveClass

‎src/NHibernate/Type/StringType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ internal StringType(StringSqlType sqlType) : base(sqlType) {
1616
}
1717

1818
public override object Get(IDataReader rs, int index) {
19-
return rs.GetString(index);
19+
return Convert.ToString(rs[index]);
2020
}
2121

2222
public override object Get(IDataReader rs, string name) {
23-
return Get(rs, rs.GetOrdinal(name));
23+
return Convert.ToString(rs[name]);
2424
}
2525
public override System.Type ReturnedClass {
2626
get { return typeof(string); }

‎src/NHibernate/Type/TicksType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ public TicksType(Int64SqlType sqlType) : base(sqlType)
2323

2424
public override object Get(IDataReader rs, int index)
2525
{
26-
return new DateTime(rs.GetInt64(index));
26+
return new DateTime( Convert.ToInt64(rs[index]) );
2727
}
2828

2929
public override object Get(IDataReader rs, string name)
3030
{
31-
return Get(rs, rs.GetOrdinal(name));// rs.[name];
31+
return Get(rs, rs.GetOrdinal(name));
3232
}
3333

3434
public override System.Type ReturnedClass

‎src/NHibernate/Type/TimeSpanType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public TimeSpanType(Int64SqlType sqlType) : base(sqlType)
1818

1919
public override object Get(IDataReader rs, int index)
2020
{
21-
return new TimeSpan(rs.GetInt64(index));
21+
return new TimeSpan( Convert.ToInt64(rs[index]) );
2222
}
2323

2424
public override object Get(IDataReader rs, string name)
2525
{
26-
return Get(rs, rs.GetOrdinal(name));// rs.[name];
26+
return Get(rs, rs.GetOrdinal(name));
2727
}
2828

2929
public override System.Type ReturnedClass

‎src/NHibernate/Type/TimeType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public TimeType (TimeSqlType sqlType) : base(sqlType)
2323

2424
public override object Get(IDataReader rs, int index)
2525
{
26-
DateTime dbValue = rs.GetDateTime(index);
26+
DateTime dbValue = Convert.ToDateTime(rs[index]);
2727
return new DateTime(1, 1, 1, dbValue.Hour, dbValue.Minute, dbValue.Second);
2828
}
2929

3030
public override object Get(IDataReader rs, string name)
3131
{
32-
return Get(rs, rs.GetOrdinal(name));// rs.[name];
32+
return Get(rs, rs.GetOrdinal(name));
3333
}
3434

3535
public override System.Type ReturnedClass

‎src/NHibernate/Type/TimestampType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public TimestampType(DateTimeSqlType sqlType) : base(sqlType)
3636

3737
public override object Get(IDataReader rs, int index)
3838
{
39-
return rs.GetDateTime(index);
39+
return Convert.ToDateTime(rs[index]);
4040
}
4141

4242
public override object Get(IDataReader rs, string name)
4343
{
44-
return Get(rs, rs.GetOrdinal(name));// rs.[name];
44+
return Get(rs, rs.GetOrdinal(name));
4545
}
4646

4747
public override System.Type ReturnedClass

0 commit comments

Comments
 (0)