string separator

Author: bahusoid

src/NHibernate/Criterion/InExpression.cs

@@ -79,7 +79,7 @@ private SqlString GetSqlString(ICriteriaQuery criteriaQuery, SqlString[] columns
 			if (columns.Length <= 1 || criteriaQuery.Factory.Dialect.SupportsRowValueConstructorSyntaxInInList)
 			{
 				var wrapInParens = columns.Length > 1;
-				SqlString comaSeparator = new SqlString(", ");
+				const string comaSeparator = ", ";
 				var singleValueParam = SqlStringHelper.Repeat(new SqlString(bogusParam), columns.Length, comaSeparator, wrapInParens);
 
 				var parameters = SqlStringHelper.Repeat(singleValueParam, Values.Length, comaSeparator,  wrapInParens: false);
@@ -99,8 +99,10 @@ private SqlString GetSqlString(ICriteriaQuery criteriaQuery, SqlString[] columns
 			var cols = new SqlString(
 				" ( ",
 				SqlStringHelper.Join(new SqlString(" = ", bogusParam, " and "), columns),
-				new SqlString("= ", bogusParam, " ) "));
-			cols = SqlStringHelper.Repeat(cols, Values.Length, new SqlString(" or "), wrapInParens: Values.Length > 1);
+				"= ",
+				bogusParam,
+				" ) ");
+			cols = SqlStringHelper.Repeat(cols, Values.Length, " or ", wrapInParens: Values.Length > 1);
 			return cols;
 		}
 

src/NHibernate/Hql/Ast/ANTLR/Tree/ResultVariableRefNode.cs

@@ -67,7 +67,7 @@ private SqlString GetColumnPositionsString(int scalarColumnIndex)
 
 		private SqlString GetColumnNamesString(int scalarColumnIndex)
 		{
-			return SqlStringHelper.Join(new SqlString(", "), Walker.SelectClause.ColumnNames[scalarColumnIndex]);
+			return SqlStringHelper.Join(", ", Walker.SelectClause.ColumnNames[scalarColumnIndex]);
 		}
 	}
 }

src/NHibernate/SqlCommand/SqlStringHelper.cs

@@ -31,6 +31,25 @@ public static SqlString Join(SqlString separator, IEnumerable objects)
 			return buf.ToSqlString();
 		}
 
+		public static SqlString Join(string separator, IEnumerable objects)
+		{
+			SqlStringBuilder buf = new SqlStringBuilder();
+			bool first = true;
+
+			foreach (object obj in objects)
+			{
+				if (!first)
+				{
+					buf.Add(separator);
+				}
+
+				first = false;
+				buf.AddObject(obj);
+			}
+
+			return buf.ToSqlString();
+		}
+
 
 		public static SqlString[] Add(SqlString[] x, string sep, SqlString[] y)
 		{
@@ -91,7 +110,7 @@ internal static SqlString ParametersList(List<Parameter> parameters)
 			return builder.ToSqlString();
 		}
 
-		internal static SqlString Repeat(SqlString placeholder, int count, SqlString separator, bool wrapInParens)
+		internal static SqlString Repeat(SqlString placeholder, int count, string separator, bool wrapInParens)
 		{
 			if (count == 0)
 				return SqlString.Empty;
@@ -101,7 +120,7 @@ internal static SqlString Repeat(SqlString placeholder, int count, SqlString sep
 					? new SqlString("(", placeholder, ")")
 					: placeholder;
 
-			var builder = new SqlStringBuilder((placeholder.Count + separator.Count) * count + 1);
+			var builder = new SqlStringBuilder((placeholder.Count + 1) * count + 1);
 
 			if (wrapInParens)
 			{