Obsolete NullableType.Get by column name (#3549)

Author: hazzik

src/NHibernate.DomainModel/NHSpecific/NullableTypesType.cs

@@ -30,11 +30,6 @@ public override object NullSafeGet(DbDataReader rs, string name, ISessionImpleme
 			}
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override string Name
 		{
 			get { return ReturnedClass.Name; }

src/NHibernate.Test/Async/TypesTest/BooleanTypeFixture.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using System;
 using System.Data.Common;
 using NHibernate.Engine;
 using NHibernate.Type;

src/NHibernate.Test/Async/TypesTest/GuidTypeFixture.cs

@@ -83,4 +83,4 @@ public async Task GuidInWhereClauseAsync()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/TypesTest/BooleanTypeFixture.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Data.Common;
 using NHibernate.Engine;
 using NHibernate.Type;
@@ -69,21 +70,24 @@ public void GetByIndex(bool expected)
 		}
 
 		[Theory]
+		[Obsolete("Testing obsolete API")]
 		public void GetByName(bool expected)
 		{
 			const string name0 = "name0";
 			const string name1 = "name1";
-			BooleanType type = NHibernateUtil.Boolean;
+			var type = NHibernateUtil.Boolean;
 			var session = Substitute.For<ISessionImplementor>();
 			var reader = Substitute.For<DbDataReader>();
-			reader[name0].Returns(expected);
-			reader[name1].Returns(expected);
+			reader.GetOrdinal(name0).Returns(0);
+			reader.GetOrdinal(name1).Returns(1);
+			reader[0].Returns(expected);
+			reader[1].Returns(expected);
 
 			var result0 = type.Get(reader, name0, session);
 			var result1 = type.Get(reader, name1, session);
 
-			Assert.AreEqual(expected, (bool) result0);
-			Assert.AreSame(result0, result1);
+			Assert.That((bool) result0, Is.EqualTo(expected));
+			Assert.That(result1, Is.SameAs(result0));
 		}
 
 		[Test]

src/NHibernate.Test/TypesTest/CharBooleanTypeFixture.cs

@@ -1,4 +1,5 @@
-using System.Data.Common;
+using System;
+using System.Data.Common;
 using NHibernate.Engine;
 using NHibernate.SqlTypes;
 using NHibernate.Type;
@@ -29,6 +30,7 @@ public void GetByIndex(bool expected)
 		}
 
 		[Theory]
+		[Obsolete("Testing obsolete API")]
 		public void GetByName(bool value)
 		{
 			const string name = "0";
@@ -42,7 +44,7 @@ public void GetByName(bool value)
 
 			var result = type.Get(reader, name, session);
 
-			Assert.AreSame(expected, result);
+			Assert.That(result, Is.SameAs(expected));
 		}
 
 		[Theory]

src/NHibernate.Test/TypesTest/GuidTypeFixture.cs

@@ -93,7 +93,7 @@ public void GuidInWhereClause()
 		[Test]
 		public void GetGuidWorksWhenUnderlyingTypeIsRepresentedByString()
 		{
-			GuidType type = (GuidType)NHibernateUtil.Guid;
+			var type = NHibernateUtil.Guid;
 
 			Guid value = Guid.NewGuid();
 			DataTable data = new DataTable("test");
@@ -106,14 +106,15 @@ public void GetGuidWorksWhenUnderlyingTypeIsRepresentedByString()
 			var reader = data.CreateDataReader();
 			reader.Read();
 
-			using (var s = OpenSession())
-			{
-				var si = s.GetSessionImplementation();
-				Assert.AreEqual(value, type.Get(reader, "guid", si));
-				Assert.AreEqual(value, type.Get(reader, 0, si));
-				Assert.AreEqual(value, type.Get(reader, "varchar", si));
-				Assert.AreEqual(value, type.Get(reader, 1, si));
-			}
+			using var s = OpenSession();
+			var si = s.GetSessionImplementation();
+			
+			Assert.That(type.Get(reader, 0, si), Is.EqualTo(value));
+			Assert.That(type.Get(reader, 1, si), Is.EqualTo(value));
+#pragma warning disable CS0618 // Type or member is obsolete
+			Assert.That(type.Get(reader, "guid", si), Is.EqualTo(value));
+			Assert.That(type.Get(reader, "varchar", si), Is.EqualTo(value));
+#pragma warning restore CS0618 // Type or member is obsolete
 		}
 	}
-}
+}

src/NHibernate/Type/AbstractBinaryType.cs

@@ -90,11 +90,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return ToExternalFormat(buffer);
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override int GetHashCode(object x)
 		{
 			byte[] bytes = ToInternalFormat(x);

src/NHibernate/Type/AbstractCharType.cs

@@ -30,11 +30,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return '\0'; // This line should never be executed
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Get(rs, rs.GetOrdinal(name), session);
-		}
-
 		public override System.Type PrimitiveClass
 		{
 			get { return typeof(char); }

src/NHibernate/Type/AbstractDateTimeType.cs

@@ -58,10 +58,6 @@ protected virtual DateTime AdjustDateTime(DateTime dateValue) =>
 		public override object Get(DbDataReader rs, int index, ISessionImplementor session) =>
 			GetDateTime(rs, index, session);
 
-		/// <inheritdoc />
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session) =>
-			Get(rs, rs.GetOrdinal(name), session);
-
 		/// <summary>
 		/// Get the <see cref="DateTime" /> in the <see cref="DbDataReader"/> for the Property.
 		/// </summary>

src/NHibernate/Type/AbstractStringType.cs

@@ -76,11 +76,6 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			return Convert.ToString(rs[index]);
 		}
 
-		public override object Get(DbDataReader rs, string name, ISessionImplementor session)
-		{
-			return Convert.ToString(rs[name]);
-		}
-
 		public override bool IsEqual(object x, object y)
 		{
 			return Comparer.Equals(x, y);