Simplify parens handling

Author: bahusoid

src/NHibernate.Test/Async/CompositeId/ClassWithCompositeIdFixture.cs

@@ -358,8 +358,10 @@ public async Task QueryOverInClauseAsync()
 
 			using (var s = OpenSession())
 			{
-				var results = await (s.QueryOver<ClassWithCompositeId>().WhereRestrictionOn(p => p.Id).IsIn(new[] {id, secondId}).ListAsync());
-				Assert.That(results.Count, Is.EqualTo(2));
+				var results1 = await (s.QueryOver<ClassWithCompositeId>().WhereRestrictionOn(p => p.Id).IsIn(new[] {id, secondId}).ListAsync());
+				var results2 = await (s.QueryOver<ClassWithCompositeId>().WhereRestrictionOn(p => p.Id).IsIn(new[] {id}).ListAsync());
+				Assert.That(results1.Count, Is.EqualTo(2));
+				Assert.That(results2.Count, Is.EqualTo(1));
 			}
 		}
 	}

src/NHibernate.Test/CompositeId/ClassWithCompositeIdFixture.cs

@@ -347,8 +347,10 @@ public void QueryOverInClause()
 
 			using (var s = OpenSession())
 			{
-				var results = s.QueryOver<ClassWithCompositeId>().WhereRestrictionOn(p => p.Id).IsIn(new[] {id, secondId}).List();
-				Assert.That(results.Count, Is.EqualTo(2));
+				var results1 = s.QueryOver<ClassWithCompositeId>().WhereRestrictionOn(p => p.Id).IsIn(new[] {id, secondId}).List();
+				var results2 = s.QueryOver<ClassWithCompositeId>().WhereRestrictionOn(p => p.Id).IsIn(new[] {id}).List();
+				Assert.That(results1.Count, Is.EqualTo(2));
+				Assert.That(results2.Count, Is.EqualTo(1));
 			}
 		}
 	}

src/NHibernate/Criterion/InExpression.cs

@@ -78,18 +78,18 @@ private SqlString GetSqlString(ICriteriaQuery criteriaQuery, SqlString[] columns
 		{
 			if (columns.Length <= 1 || criteriaQuery.Factory.Dialect.SupportsRowValueConstructorSyntaxInInList)
 			{
-				var parens = columns.Length > 1 ? new[] {new SqlString("("), new SqlString(")"),} : null;
+				var wrapInParens = columns.Length > 1;
 				SqlString comaSeparator = new SqlString(", ");
-				var singleValueParam = SqlStringHelper.Repeat(new SqlString(bogusParam), columns.Length, comaSeparator, parens);
+				var singleValueParam = SqlStringHelper.Repeat(new SqlString(bogusParam), columns.Length, comaSeparator, wrapInParens);
 
-				var parameters = SqlStringHelper.Repeat(singleValueParam, Values.Length, comaSeparator, null);
+				var parameters = SqlStringHelper.Repeat(singleValueParam, Values.Length, comaSeparator,  wrapInParens: false);
 
 				//single column: col1 in (?, ?)
 				//multi column:  (col1, col2) in ((?, ?), (?, ?))
 				return new SqlString(
-					parens?[0] ?? SqlString.Empty,
+					wrapInParens ? StringHelper.OpenParen : string.Empty,
 					SqlStringHelper.Join(comaSeparator, columns),
-					parens?[1] ?? SqlString.Empty,
+					wrapInParens ? StringHelper.ClosedParen : string.Empty,
 					" in (",
 					parameters,
 					")");
@@ -100,7 +100,7 @@ private SqlString GetSqlString(ICriteriaQuery criteriaQuery, SqlString[] columns
 				" ( ",
 				SqlStringHelper.Join(new SqlString(" = ", bogusParam, " and "), columns),
 				new SqlString("= ", bogusParam, " ) "));
-			cols = SqlStringHelper.Repeat(cols, Values.Length, "or ", new[] {" ( ", " ) "});
+			cols = SqlStringHelper.Repeat(cols, Values.Length, new SqlString(" or "), wrapInParens: Values.Length > 1);
 			return cols;
 		}
 

src/NHibernate/SqlCommand/SqlStringHelper.cs

@@ -56,6 +56,7 @@ public static bool IsNotEmpty(SqlString str)
 			return !IsEmpty(str);
 		}
 
+
 		public static bool IsEmpty(SqlString str)
 		{
 			return str == null || str.Count == 0;
@@ -90,49 +91,35 @@ internal static SqlString ParametersList(List<Parameter> parameters)
 			return builder.ToSqlString();
 		}
 
-		internal static SqlString Repeat(SqlString placeholder, int count, string separator, string[] wrapResult)
+		internal static SqlString Repeat(SqlString placeholder, int count, SqlString separator, bool wrapInParens)
 		{
-			return Repeat(
-				placeholder,
-				count,
-				new SqlString(separator),
-				wrapResult == null
-					? null
-					: new[]
-					{
-						new SqlString(wrapResult[0]),
-						new SqlString(wrapResult[1]),
-					});
-		}
+			if (count == 0)
+				return SqlString.Empty;
 
-		internal static SqlString Repeat(SqlString placeholder, int count, SqlString separator, SqlString[] wrapResult)
-		{
-			if (wrapResult == null)
-			{
-				if (count == 0)
-					return SqlString.Empty;
-				if (count == 1)
-					return placeholder;
-			}
+			if (count == 1)
+				return wrapInParens
+					? new SqlString("(", placeholder, ")")
+					: placeholder;
 
-			var builder = new SqlStringBuilder(count * 2 + 1);
-			if (wrapResult != null)
+			var builder = new SqlStringBuilder((placeholder.Count + separator.Count) * count + 1);
+
+			if (wrapInParens)
 			{
-				builder.Add(wrapResult[0]);
+				builder.Add("(");
 			}
 
-			if (count > 0)
-				builder.Add(placeholder);
+			builder.Add(placeholder);
 
 			for (int i = 1; i < count; i++)
 			{
 				builder.Add(separator).Add(placeholder);
 			}
 
-			if (wrapResult != null)
+			if (wrapInParens)
 			{
-				builder.Add(wrapResult[1]);
+				builder.Add(")");
 			}
+
 			return builder.ToSqlString();
 		}
 	}