Add handling BigInteger

hazzik · hazzik · commit 5de7fe969161 · 2022-09-28T13:54:44.000+13:00
diff --git a/src/NHibernate/Type/ByteType.cs b/src/NHibernate/Type/ByteType.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -23,12 +24,21 @@ public ByteType()
 
 		public override object Get(DbDataReader rs, int index, ISessionImplementor session)
 		{
-			return Convert.ToByte(rs[index]);
+			return rs[index] switch
+			{
+
+				BigInteger bi => (byte) bi,
+				var c => Convert.ToByte(c)
+			};
 		}
 
 		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
 		{
-			return Convert.ToByte(rs[name]);
+			return rs[name] switch
+			{
+				BigInteger bi => (byte) bi,
+				var c => Convert.ToByte(c)
+			};
 		}
 
 		public override System.Type ReturnedClass
diff --git a/src/NHibernate/Type/Int16Type.cs b/src/NHibernate/Type/Int16Type.cs
@@ -5,6 +5,7 @@
 using NHibernate.SqlTypes;
 using System.Collections.Generic;
 using System.Data;
+using System.Numerics;
 
 namespace NHibernate.Type
 {
@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToInt16(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (short) bi,
+					var c => Convert.ToInt16(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToInt16(rs[name]);
+				return rs[name]switch
+				{
+					BigInteger bi => (short) bi,
+					var c => Convert.ToInt16(c)
+				};
 			}
 			catch (Exception ex)
 			{
diff --git a/src/NHibernate/Type/Int32Type.cs b/src/NHibernate/Type/Int32Type.cs
@@ -5,6 +5,7 @@
 using NHibernate.SqlTypes;
 using System.Collections.Generic;
 using System.Data;
+using System.Numerics;
 
 namespace NHibernate.Type
 {
@@ -27,11 +28,16 @@ public override string Name
 		}
 
 		private static readonly Int32 ZERO = 0;
+
 		public override object Get(DbDataReader rs, int index, ISessionImplementor session)
 		{
 			try
 			{
-				return Convert.ToInt32(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (int) bi,
+					var c => Convert.ToInt32(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +49,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToInt32(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (int) bi,
+					var c => Convert.ToInt32(c)
+				};
 			}
 			catch (Exception ex)
 			{
diff --git a/src/NHibernate/Type/Int64Type.cs b/src/NHibernate/Type/Int64Type.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToInt64(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (long) bi,
+					var c => Convert.ToInt64(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToInt64(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (long) bi,
+					var c => Convert.ToInt64(c)
+				};
 			}
 			catch (Exception ex)
 			{
diff --git a/src/NHibernate/Type/SByteType.cs b/src/NHibernate/Type/SByteType.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToSByte(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (sbyte) bi,
+					var c => Convert.ToSByte(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToSByte(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (sbyte) bi,
+					var c => Convert.ToSByte(c)
+				};
 			}
 			catch (Exception ex)
 			{
diff --git a/src/NHibernate/Type/UInt16Type.cs b/src/NHibernate/Type/UInt16Type.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToUInt16(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (ushort) bi,
+					var c => Convert.ToUInt16(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToUInt16(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (ushort) bi,
+					var c => Convert.ToUInt16(c)
+				};
 			}
 			catch (Exception ex)
 			{
diff --git a/src/NHibernate/Type/UInt32Type.cs b/src/NHibernate/Type/UInt32Type.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToUInt32(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (uint) bi,
+					var c => Convert.ToUInt32(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToUInt32(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (uint) bi,
+					var c => Convert.ToUInt32(c)
+				};
 			}
 			catch (Exception ex)
 			{
diff --git a/src/NHibernate/Type/UInt64Type.cs b/src/NHibernate/Type/UInt64Type.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Numerics;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 
@@ -30,7 +31,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		{
 			try
 			{
-				return Convert.ToUInt64(rs[index]);
+				return rs[index] switch
+				{
+					BigInteger bi => (ulong)bi,
+					var c => Convert.ToUInt64(c)
+				};
 			}
 			catch (Exception ex)
 			{
@@ -42,7 +47,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses
 		{
 			try
 			{
-				return Convert.ToUInt64(rs[name]);
+				return rs[name] switch
+				{
+					BigInteger bi => (ulong) bi,
+					var c => Convert.ToUInt64(c)
+				};
 			}
 			catch (Exception ex)
 			{

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using NHibernate.SqlTypes;`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Data;`
	`8`	`+using System.Numerics;`
`8`	`9`
`9`	`10`	`namespace NHibernate.Type`
`10`	`11`	`{`
`@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi`
`31`	`32`	`{`
`32`	`33`	`try`
`33`	`34`	`{`
`34`		`- return Convert.ToInt16(rs[index]);`
	`35`	`+ return rs[index] switch`
	`36`	`+ {`
	`37`	`+ BigInteger bi => (short) bi,`
	`38`	`+ var c => Convert.ToInt16(c)`
	`39`	`+ };`
`35`	`40`	`}`
`36`	`41`	`catch (Exception ex)`
`37`	`42`	`{`
`@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses`
`43`	`48`	`{`
`44`	`49`	`try`
`45`	`50`	`{`
`46`		`- return Convert.ToInt16(rs[name]);`
	`51`	`+ return rs[name]switch`
	`52`	`+ {`
	`53`	`+ BigInteger bi => (short) bi,`
	`54`	`+ var c => Convert.ToInt16(c)`
	`55`	`+ };`
`47`	`56`	`}`
`48`	`57`	`catch (Exception ex)`
`49`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Data;`
`5`	`5`	`using System.Data.Common;`
	`6`	`+using System.Numerics;`
`6`	`7`	`using NHibernate.Engine;`
`7`	`8`	`using NHibernate.SqlTypes;`
`8`	`9`
`@@ -31,7 +32,11 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi`
`31`	`32`	`{`
`32`	`33`	`try`
`33`	`34`	`{`
`34`		`- return Convert.ToInt64(rs[index]);`
	`35`	`+ return rs[index] switch`
	`36`	`+ {`
	`37`	`+ BigInteger bi => (long) bi,`
	`38`	`+ var c => Convert.ToInt64(c)`
	`39`	`+ };`
`35`	`40`	`}`
`36`	`41`	`catch (Exception ex)`
`37`	`42`	`{`
`@@ -43,7 +48,11 @@ public override object Get(DbDataReader rs, string name, ISessionImplementor ses`
`43`	`48`	`{`
`44`	`49`	`try`
`45`	`50`	`{`
`46`		`- return Convert.ToInt64(rs[name]);`
	`51`	`+ return rs[name] switch`
	`52`	`+ {`
	`53`	`+ BigInteger bi => (long) bi,`
	`54`	`+ var c => Convert.ToInt64(c)`
	`55`	`+ };`
`47`	`56`	`}`
`48`	`57`	`catch (Exception ex)`
`49`	`58`	`{`