Skip to content

Fix asymmetrical SqlType.Equals #2534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 15, 2020
Merged

Fix asymmetrical SqlType.Equals #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc18939
Fix asymmetrical SqlType.Equals
bahusoid Sep 9, 2020
8213689
Fix tests
bahusoid Sep 14, 2020
1b2a870
Fix test
bahusoid Sep 14, 2020
6cf057b
Code review
bahusoid Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/NHibernate.Test/TypesTest/ChangeDefaultTypeWithLengthFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ public void PropertyType()
var propertyType25 = Sfi.GetClassMetadata(typeof(ChangeDefaultTypeClass))
.GetPropertyType(nameof(ChangeDefaultTypeClass.StringTypeLengthInType25));
Assert.That(
propertyType25,
Is.EqualTo(_testDefaultStringType));
propertyType25.GetType(),
Is.EqualTo(_testDefaultStringType.GetType()));
Assert.That(propertyType25.SqlTypes(Sfi)[0].Length, Is.EqualTo(25));

var propertyType20 = Sfi.GetClassMetadata(typeof(ChangeDefaultTypeClass))
.GetPropertyType(nameof(ChangeDefaultTypeClass.StringTypeExplicitLength20));

Assert.That(
propertyType20,
Is.EqualTo(_testDefaultStringType));
propertyType20.GetType(),
Is.EqualTo(_testDefaultStringType.GetType()));
Assert.That(propertyType20.SqlTypes(Sfi)[0].Length, Is.EqualTo(20));
}

Expand Down
8 changes: 4 additions & 4 deletions src/NHibernate.Test/TypesTest/ChangeDefaultTypeWithPrecisionFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ public void PropertyType()
var propertyType1 = Sfi.GetClassMetadata(typeof(ChangeDefaultTypeClass))
.GetPropertyType(nameof(ChangeDefaultTypeClass.CurrencyTypeExplicitPrecision6And3));
Assert.That(
propertyType1,
Is.EqualTo(_testDefaultType));
propertyType1.GetType(),
Is.EqualTo(_testDefaultType.GetType()));
Assert.That(propertyType1.SqlTypes(Sfi)[0].Precision, Is.EqualTo(6));
Assert.That(propertyType1.SqlTypes(Sfi)[0].Scale, Is.EqualTo(3));

var propertyType2 = Sfi.GetClassMetadata(typeof(ChangeDefaultTypeClass))
.GetPropertyType(nameof(ChangeDefaultTypeClass.CurrencyTypePrecisionInType5And2));

Assert.That(
propertyType2,
Is.EqualTo(_testDefaultType));
propertyType2.GetType(),
Is.EqualTo(_testDefaultType.GetType()));
Assert.That(propertyType2.SqlTypes(Sfi)[0].Precision, Is.EqualTo(5));
Assert.That(propertyType2.SqlTypes(Sfi)[0].Scale, Is.EqualTo(2));
}
Expand Down
42 changes: 26 additions & 16 deletions src/NHibernate/SqlTypes/SqlType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace NHibernate.SqlTypes
/// </p>
/// </remarks>
[Serializable]
public class SqlType
public class SqlType : IEquatable<SqlType>
{
private readonly DbType dbType;
private readonly int length;
Expand Down Expand Up @@ -125,24 +125,34 @@ public override bool Equals(object obj)

public bool Equals(SqlType rhsSqlType)
{
if (ReferenceEquals(this, rhsSqlType))
return true;

if (rhsSqlType == null)
{
return false;
}

if (LengthDefined)
{
return (DbType.Equals(rhsSqlType.DbType)) && (Length == rhsSqlType.Length);
}
if (PrecisionDefined)
{
return (DbType.Equals(rhsSqlType.DbType)) && (Precision == rhsSqlType.Precision) && (Scale == rhsSqlType.Scale);
}
if (ScaleDefined)
{
return DbType.Equals(rhsSqlType.DbType) && Scale == rhsSqlType.Scale;
}
return (DbType.Equals(rhsSqlType.DbType));
if (DbType != rhsSqlType.DbType)
return false;

if (LengthDefined != rhsSqlType.LengthDefined)
return false;

if (PrecisionDefined != rhsSqlType.PrecisionDefined)
return false;

if (ScaleDefined != rhsSqlType.ScaleDefined)
return false;

if (Length != rhsSqlType.Length)
return false;

if (Precision != rhsSqlType.Precision)
return false;

if (Scale != rhsSqlType.Scale)
return false;

return true;
}

public override string ToString()
Expand Down