Skip to content

Commit 0e81f7c

Browse files
committed
Review changes
1 parent e8e7896 commit 0e81f7c

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

src/NHibernate/Criterion/PropertyExpression.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,25 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri
7575
var otherColumnNames =
7676
CriterionUtil.GetColumnNamesAsSqlStringParts(_rhsPropertyName, _rhsProjection, criteriaQuery, criteria);
7777

78-
SqlStringBuilder sb = new SqlStringBuilder();
79-
if (columnNames.Length > 1)
78+
switch (columnNames.Length)
8079
{
81-
sb.Add(StringHelper.OpenParen);
80+
case 1:
81+
return new SqlString(columnNames[0], Op, otherColumnNames[0]);
82+
case 0:
83+
return SqlString.Empty;
8284
}
83-
bool first = true;
85+
86+
var sb = new SqlStringBuilder();
87+
sb.Add(StringHelper.OpenParen);
88+
8489
for (var i = 0; i < columnNames.Length; i++)
8590
{
86-
if (first == false)
87-
{
91+
if (i != 0)
8892
sb.Add(" and ");
89-
}
90-
first = false;
91-
sb.AddObject(columnNames[i]).Add(Op).AddObject(otherColumnNames[i]);
92-
}
9393

94-
if (columnNames.Length > 1)
95-
{
96-
sb.Add(StringHelper.ClosedParen);
94+
sb.AddObject(columnNames[i]).Add(Op).AddObject(otherColumnNames[i]);
9795
}
96+
sb.Add(StringHelper.ClosedParen);
9897

9998
return sb.ToSqlString();
10099
}

0 commit comments

Comments
 (0)