Skip to content

Commit 4b52aa3

Browse files
committed
Remove unnecessary ReferencedColumnsReadOnly
1 parent cf0fc4d commit 4b52aa3

File tree

1 file changed

+6
-21
lines changed

1 file changed

+6
-21
lines changed

src/NHibernate/Mapping/ForeignKey.cs

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -192,22 +192,12 @@ internal void AddReferencedTable(PersistentClass referencedClass)
192192

193193
public override string ToString()
194194
{
195-
if (!IsReferenceToPrimaryKey)
196-
{
197-
var result = new StringBuilder();
198-
result.Append(GetType().FullName)
199-
.Append('(')
200-
.Append(Table.Name)
201-
.Append(string.Join(", ", Columns))
202-
.Append(" ref-columns:")
203-
.Append('(')
204-
.Append(string.Join(", ", ReferencedColumnsReadOnly))
205-
.Append(") as ")
206-
.Append(Name);
207-
return result.ToString();
208-
}
195+
if (IsReferenceToPrimaryKey)
196+
return base.ToString();
209197

210-
return base.ToString();
198+
var columns = string.Join(", ", Columns);
199+
var refColumns = string.Join(", ", referencedColumns);
200+
return $"{GetType().FullName}({Table.Name}{columns} ref-columns:({refColumns}) as {Name}";
211201
}
212202

213203
public bool HasPhysicalConstraint
@@ -227,11 +217,6 @@ public IList<Column> ReferencedColumns
227217
}
228218
}
229219

230-
private IEnumerable<Column> ReferencedColumnsReadOnly
231-
{
232-
get { return referencedColumns ?? Enumerable.Empty<Column>(); }
233-
}
234-
235220
public string ReferencedEntityName
236221
{
237222
get { return referencedEntityName; }
@@ -253,7 +238,7 @@ public override bool IsGenerated(Dialect.Dialect dialect)
253238
if (dialect.SupportsNullInUnique || IsReferenceToPrimaryKey)
254239
return true;
255240

256-
foreach (var column in ReferencedColumnsReadOnly)
241+
foreach (var column in referencedColumns)
257242
{
258243
if (column.IsNullable)
259244
return false;

0 commit comments

Comments
 (0)