Skip to content

Commit 3cbd324

Browse files
committed
Fix error in ForeignKey.ToString method
1 parent 30ff821 commit 3cbd324

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

src/NHibernate.Test/MappingTest/ForeignKeyFixture.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,25 @@ public void UnmatchingColumns()
3939
fk.ReferencedTable = primaryTable;
4040
Assert.Throws<FKUnmatchingColumnsException>(() => fk.AlignColumns());
4141
}
42+
43+
[Test]
44+
public void ToStringDoesNotThrow()
45+
{
46+
var key = new ForeignKey
47+
{
48+
Table = new Table("TestTable"),
49+
Name = "TestForeignKey"
50+
};
51+
key.AddColumn(new Column("TestColumn"));
52+
key.AddReferencedColumns(new[] { new Column("ReferencedColumn") });
53+
54+
string toString = null;
55+
Assert.DoesNotThrow(() =>
56+
{
57+
toString = key.ToString();
58+
});
59+
60+
Assert.That(toString, Is.EqualTo("NHibernate.Mapping.ForeignKey(TestTableNHibernate.Mapping.Column(TestColumn) ref-columns:(NHibernate.Mapping.Column(ReferencedColumn)) as TestForeignKey"));
61+
}
4262
}
4363
}

src/NHibernate/Mapping/ForeignKey.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ public override string ToString()
178178
result.Append(GetType().FullName)
179179
.Append('(')
180180
.Append(Table.Name)
181-
.Append(ArrayHelper.ToStringArray((ICollection)Columns))
181+
.Append(StringHelper.Join(", " , Columns))
182182
.Append(" ref-columns:")
183-
.Append('(')
184-
.Append(ArrayHelper.ToStringArray((ICollection)ReferencedColumns))
183+
.Append('(')
184+
.Append(StringHelper.Join(", ", ReferencedColumns))
185185
.Append(") as ")
186186
.Append(Name);
187187
return result.ToString();

0 commit comments

Comments
 (0)