Skip to content

Commit 5417dbc

Browse files
committed
Obsolete StringHelper.Join
1 parent 95d38c1 commit 5417dbc

21 files changed

+33
-39
lines changed

src/NHibernate/Criterion/ConditionalProjection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public override IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuer
7373
if(areEqual == false)
7474
{
7575
string msg = "Both true and false projections must return the same types."+ Environment.NewLine +
76-
"But True projection returns: ["+StringHelper.Join(", ", trueTypes) +"] "+ Environment.NewLine+
77-
"And False projection returns: ["+StringHelper.Join(", ", falseTypes)+ "]";
76+
"But True projection returns: ["+string.Join<IType>(", ", trueTypes) +"] "+ Environment.NewLine+
77+
"And False projection returns: ["+string.Join<IType>(", ", falseTypes)+ "]";
7878

7979
throw new HibernateException(msg);
8080
}

src/NHibernate/Criterion/IdentifierProjection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery cr
6464
{
6565
throw new InvalidOperationException("not a grouping projection");
6666
}
67-
return new SqlString(StringHelper.Join(",", criteriaQuery.GetIdentifierColumns(criteria)));
67+
return new SqlString(string.Join(",", criteriaQuery.GetIdentifierColumns(criteria)));
6868
}
6969
}
7070
}

src/NHibernate/Criterion/Junction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri
106106

107107
public override string ToString()
108108
{
109-
return '(' + StringHelper.Join(Op, criteria) + ')';
109+
return '(' + string.Join(Op, criteria) + ')';
110110
}
111111

112112
public override IProjection[] GetProjections()

src/NHibernate/Criterion/PropertyProjection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery cr
7272
{
7373
throw new InvalidOperationException("not a grouping projection");
7474
}
75-
return new SqlString(StringHelper.Join(",", criteriaQuery.GetColumns(criteria, propertyName)));
75+
return new SqlString(string.Join(",", criteriaQuery.GetColumns(criteria, propertyName)));
7676
}
7777
}
78-
}
78+
}

src/NHibernate/Dialect/InformixDialect.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,14 +441,14 @@ public override string GetAddForeignKeyConstraintString(string constraintName, s
441441
var res = new StringBuilder(200);
442442

443443
res.Append(" add constraint foreign key (")
444-
.Append(StringHelper.Join(StringHelper.CommaSpace, foreignKey))
444+
.Append(string.Join(StringHelper.CommaSpace, foreignKey))
445445
.Append(") references ")
446446
.Append(referencedTable);
447447

448448
if (!referencesPrimaryKey)
449449
{
450450
res.Append(" (")
451-
.Append(StringHelper.Join(StringHelper.CommaSpace, primaryKey))
451+
.Append(string.Join(StringHelper.CommaSpace, primaryKey))
452452
.Append(')');
453453
}
454454

src/NHibernate/Dialect/MsSql2000Dialect.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ public LockHintAppender(MsSql2000Dialect dialect, IDictionary<string, LockMode>
788788

789789
// Regex matching any alias out of those given. Aliases should contain
790790
// no dangerous characters (they are identifiers) so they are not escaped.
791-
var aliasesPattern = StringHelper.Join("|", aliasedLockModes.Keys);
791+
var aliasesPattern = string.Join("|", aliasedLockModes.Keys);
792792

793793
// Match < alias >, < alias,>, or < alias$>, the intent is to capture alias names
794794
// in various kinds of "FROM table1 alias1, table2 alias2".

src/NHibernate/Dialect/Oracle8iDialect.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ private static string ExtractColumnOrAliasNames(SqlString select)
389389
Dictionary<SqlString, SqlString> columnToAlias;
390390
ExtractColumnOrAliasNames(select, out columnsOrAliases, out aliasToColumn, out columnToAlias);
391391

392-
return StringHelper.Join(",", columnsOrAliases);
392+
return string.Join(",", columnsOrAliases);
393393
}
394394

395395
/// <summary>

src/NHibernate/Engine/SubselectFetch.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public SqlString ToSubselectString(string ukname)
4040
? StringHelper.Qualify(alias, loadable.IdentifierColumnNames)
4141
: ((IPropertyMapping) loadable).ToColumns(alias, ukname);
4242

43-
return new SqlString("select ", StringHelper.Join(", ", joinColumns), queryString);
43+
return new SqlString("select ", string.Join(", ", joinColumns), queryString);
4444
}
4545

4646
public override string ToString()
4747
{
4848
return "SubselectFetch(" + queryString + ')';
4949
}
5050
}
51-
}
51+
}

src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private static SqlString GetWhereJoinFragment(IJoinable persister, string tableA
143143

144144
protected string GenerateIdSubselect(IQueryable persister)
145145
{
146-
return "select " + StringHelper.Join(", ", persister.IdentifierColumnNames) + " from " + persister.TemporaryIdTableName;
146+
return "select " + string.Join(", ", persister.IdentifierColumnNames) + " from " + persister.TemporaryIdTableName;
147147
}
148148

149149
protected virtual void CreateTemporaryTableIfNecessary(IQueryable persister, ISessionImplementor session)

src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableDeleteExecutor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public MultiTableDeleteExecutor(IStatement statement)
5151
// defining all the needed attributes), then we could then get an array of those
5252
SqlDeleteBuilder delete = new SqlDeleteBuilder(Factory.Dialect, Factory)
5353
.SetTableName(tableNames[i])
54-
.SetWhere("(" + StringHelper.Join(", ", columnNames[i]) + ") IN (" + idSubselect + ")");
54+
.SetWhere("(" + string.Join(", ", columnNames[i]) + ") IN (" + idSubselect + ")");
5555
if (Factory.Settings.IsCommentsEnabled)
5656
{
5757
delete.SetComment("bulk delete");

0 commit comments

Comments
 (0)