Apply suggestions from code review

Co-authored-by: Frédéric Delaporte <[email protected]>

Author: gliljas

src/NHibernate.Test/TypesTest/GenericTypeFixtureBase.cs

@@ -224,7 +224,8 @@ public virtual void CanQueryProperties()
 					var value = property.Compile()(testValue);
 					var where = Expression.Lambda<Func<TestEntity, bool>>(Expression.Equal(body.Replace(property.Parameters[0], prop), Expression.Constant(value)), param);
 					TestEntity entity = null;
-					Assert.DoesNotThrow(() => entity = session.Query<TestEntity>().FirstOrDefault(where), "Unable to query property " + member.Member.Name);
+					Assert.That(() => entity = session.Query<TestEntity>().FirstOrDefault(where), Throws.Nothing,
+						"Unable to query property " + member.Member.Name);
 					Assert.That(entity, Is.Not.Null, "Unable to query property " + member.Member.Name);
 				}
 			}

src/NHibernate.Test/TypesTest/TimeOnlyAsTicksTypeFixture.cs

@@ -9,7 +9,6 @@
 
 namespace NHibernate.Test.TypesTest
 {
-
 	[TestFixture(false)]
 	[TestFixture(true)]
 	public class TimeOnlyAsTicksTypeFixture : AbstractTimeOnlyTypeWithScaleFixture<TimeOnlyAsTicksType>

src/NHibernate/Type/AbstractDateOnlyType.cs

@@ -37,7 +37,7 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 			catch (Exception ex) when (ex is not FormatException)
 			{
-				throw new FormatException(string.Format("Input string '{0}' was not in the correct format.", rs[index]), ex);
+				throw new FormatException(string.Format("Input '{0}' was not convertible to DateOnly.", rs[index]), ex);
 			}
 		}
 
@@ -50,7 +50,7 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 		/// <inheritdoc />
 		public override void Set(DbCommand st, object value, int index, ISessionImplementor session)
 		{
-			st.Parameters[index].Value = GetParameterValueToSet((DateOnly) value,session);
+			st.Parameters[index].Value = GetParameterValueToSet((DateOnly) value, session);
 		}
 
 		/// <summary>
@@ -82,7 +82,6 @@ public override bool IsEqual(object x, object y)
 		/// <inheritdoc />
 		public override string ToLoggableString(object value, ISessionFactoryImplementor factory) =>
 			value == null ? null : ((DateOnly) value).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
-
 	}
 }
 #endif

src/NHibernate/Type/AbstractTimeOnlyType.cs

@@ -38,7 +38,6 @@ protected AbstractTimeOnlyType(byte? fractionalSecondsPrecision, SqlType sqlType
 			}
 		}
 
-
 		public override string Name => GetType().Name.EndsWith("Type", StringComparison.Ordinal)
 			? GetType().Name[..^4]
 			: GetType().Name;
@@ -50,7 +49,7 @@ protected AbstractTimeOnlyType(byte? fractionalSecondsPrecision, SqlType sqlType
 		public override object DefaultValue => TimeOnly.MinValue;
 
 		/// <summary>
-		/// Truncate (floor) fractional seconds beyond declared precision.
+		/// Truncate (floor) fractional seconds according to the declared precision.
 		/// Override to change behavior (e.g., implement rounding).
 		/// </summary>
 		protected virtual TimeOnly AdjustTimeOnly(TimeOnly timeOnly)
@@ -89,7 +88,7 @@ public override object Get(DbDataReader rs, int index, ISessionImplementor sessi
 			}
 			catch (Exception ex) when (ex is not FormatException)
 			{
-				throw new FormatException(string.Format("Input string '{0}' was not in the correct format.", rs[index]), ex);
+				throw new FormatException(string.Format("Input '{0}' was not convertible to TimeOnly.", rs[index]), ex);
 			}
 		}
 

src/NHibernate/Type/DateOnlyAsDateType.cs

@@ -28,10 +28,9 @@ protected override DateOnly GetDateOnlyFromReader(DbDataReader rs, int index, IS
 		protected override DateTime GetParameterValueToSet(DateOnly dateOnly, ISessionImplementor session) =>
 			dateOnly.ToDateTime(TimeOnly.MinValue);
 
-
 		/// <inheritdoc />
 		public override string ObjectToSQLString(object value, Dialect.Dialect dialect) =>
-			"'" + ((DateOnly) value).ToString("yyyy-MM-dd") + "'";
+			dialect.ToStringLiteral(((DateOnly) value).ToString("yyyy-MM-dd"), SqlTypeFactory.GetAnsiString(50));
 	}
 }
 #endif

src/NHibernate/Type/TimeOnlyAsDateTimeType.cs

@@ -61,7 +61,7 @@ void IParameterizedType.SetParameterValues(IDictionary<string, string> parameter
 		}
 
 		public override string ObjectToSQLString(object value, Dialect.Dialect dialect) =>
-			"'" + GetDateTimeFromTimeOnly(AdjustTimeOnly((TimeOnly) value)).ToString(_sqlFormat) + "'";
+			dialect.ToStringLiteral(GetDateTimeFromTimeOnly(AdjustTimeOnly((TimeOnly) value)).ToString(_sqlFormat), SqlTypeFactory.GetAnsiString(50));
 	}
 }
 #endif

src/NHibernate/Type/TimeOnlyAsTicksType.cs

@@ -14,7 +14,6 @@
 
 namespace NHibernate.Type
 {
-
 	/// <summary>
 	/// Maps a <see cref="System.TimeOnly" /> property to a <see cref="DbType.Int64" /> column.
 	/// The value persisted is the Ticks property of the TimeOnly value.
@@ -48,7 +47,7 @@ public TimeOnlyAsTicksType(byte fractionalSecondsPrecision) : base(fractionalSec
 		protected override long GetParameterValueToSet(TimeOnly timeOnly, ISessionImplementor session) => timeOnly.Ticks;
 
 		public override string ObjectToSQLString(object value, Dialect.Dialect dialect) =>
-			AdjustTimeOnly((TimeOnly) value).Ticks.ToString();
+			dialect.ToStringLiteral(AdjustTimeOnly((TimeOnly) value).Ticks.ToString(), SqlTypeFactory.GetAnsiString(50));
 	}
 }
 #endif

src/NHibernate/Type/TimeOnlyAsTimeType.cs

@@ -48,7 +48,7 @@ protected override TimeOnly GetTimeOnlyFromReader(DbDataReader rs, int index, IS
 		{
 			if (rs.GetFieldType(index) == typeof(TimeSpan)) //For those dialects where DbType.Time means TimeSpan.
 			{
-				return new TimeOnly(((TimeSpan)rs[index]).Ticks);
+				return new TimeOnly(((TimeSpan) rs[index]).Ticks);
 			}
 
 			var dbValue = rs.GetDateTime(index);
@@ -72,7 +72,7 @@ void IParameterizedType.SetParameterValues(IDictionary<string, string> parameter
 		}
 
 		public override string ObjectToSQLString(object value, Dialect.Dialect dialect) =>
-			"'" + (AdjustTimeOnly((TimeOnly) value)).ToString(_sqlFormat) + "'";
+			dialect.ToStringLiteral(AdjustTimeOnly((TimeOnly) value).ToString(_sqlFormat), SqlTypeFactory.GetAnsiString(50));
 	}
 }
 #endif

src/NHibernate/Type/TypeFactory.cs

@@ -342,8 +342,7 @@ private static void RegisterDefaultNetTypes()
 
 			// object needs to have both class and serializable setup before it can
 			// be created.
-			RegisterType(typeof (Object), NHibernateUtil.Object, new[] {"object"});
-
+RegisterType(typeof (Object), NHibernateUtil.Object, new[] {"object"});
 
 #if NET6_0_OR_GREATER
 			RegisterType(typeof(DateOnly), NHibernateUtil.DateOnlyAsDate, new[] { "dateonly", "dateonlyasdate" });
@@ -936,6 +935,7 @@ public static NullableType GetTimeType(byte fractionalSecondsPrecision)
 			var key = GetKeyForLengthOrScaleBased(NHibernateUtil.Time.Name, fractionalSecondsPrecision);
 			return (NullableType)typeByTypeOfName.GetOrAdd(key, k => new TimeType(SqlTypeFactory.GetTime(fractionalSecondsPrecision)));
 		}
+
 #if NET6_0_OR_GREATER
 		/// <summary>
 		/// Gets a <see cref="TimeOnlyAsDateTimeType" /> with desired fractional seconds precision.