simplify

Author: bahusoid

src/NHibernate/Loader/Collection/DynamicBatchingCollectionLoader.cs

@@ -30,7 +30,7 @@ private JoinWalker BuildJoinWalker(IQueryableCollection collectionPersister, ISe
 		private protected override SqlString TransformSql(SqlString sqlString, QueryParameters queryParameters, HashSet<IParameterSpecification> parameterSpecifications)
 		{
 			var columns = StringHelper.Qualify(_alias, CollectionPersister.KeyColumnNames);
-			DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var result, out var parameters);
+			var result = DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var parameters);
 			parameterSpecifications.UnionWith(CreateParameterSpecificationsAndAssignBackTrack(parameters));
 			return result;
 		}

src/NHibernate/Loader/DynamicBatchingHelper.cs

@@ -2,6 +2,7 @@
 using NHibernate.Criterion;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
+using NHibernate.Util;
 
 namespace NHibernate.Loader
 {
@@ -14,25 +15,14 @@ public static SqlStringBuilder BuildBatchFetchRestrictionFragment()
 			return new SqlStringBuilder(1).Add(BatchIdPlaceholder);
 		}
 
-		public static void ExpandBatchIdPlaceholder(SqlString sqlString, QueryParameters queryParameters, string[] columns, Dialect.Dialect dialect, out SqlString result, out Parameter[] parameters)
-		{
-			var wherePart = GenerateWherePart(queryParameters, columns, dialect, out parameters);
-			result = sqlString.ReplaceLast(BatchIdPlaceholder, wherePart);
-		}
-
-		private static SqlString GenerateWherePart(QueryParameters queryParameters, string[] columns, Dialect.Dialect dialect, out Parameter[] parameters)
+		public static SqlString ExpandBatchIdPlaceholder(SqlString sqlString, QueryParameters queryParameters, string[] columns, Dialect.Dialect dialect, out Parameter[] parameters)
 		{
 			var bogusParam = Parameter.Placeholder;
 			var wherePart = InExpression.GetSqlString(columns, queryParameters.PositionalParameterValues.Length, dialect, bogusParam);
-			var paramsCount = wherePart.GetParameterCount();
-			parameters = new Parameter[paramsCount];
-			for (var i = 0; i < parameters.Length; i++)
-			{
-				parameters[i] = Parameter.Placeholder;
-			}
-
+			parameters = wherePart.Parameters.ToArray(x => Parameter.Placeholder);
 			wherePart.SubstituteBogusParameters(parameters, bogusParam);
-			return wherePart;
+
+			return sqlString.ReplaceLast(BatchIdPlaceholder, wherePart);
 		}
 
 		public static int GetIdsToLoad(object[] batch, out object[] idsToLoad)

src/NHibernate/Loader/Entity/DynamicEntityLoader.cs

@@ -31,7 +31,7 @@ public virtual IList DoEntityBatchFetch(ISessionImplementor session, QueryParame
 		private protected override SqlString TransformSql(SqlString sqlString, QueryParameters queryParameters, HashSet<IParameterSpecification> parameterSpecifications)
 		{
 			var columns = StringHelper.Qualify(_alias, persister.KeyColumnNames);
-			DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var result, out var parameters);
+			var result = DynamicBatchingHelper.ExpandBatchIdPlaceholder(sqlString, queryParameters, columns, Factory.Dialect, out var parameters);
 			parameterSpecifications.UnionWith(CreateParameterSpecificationsAndAssignBackTrack(parameters));
 			return result;
 		}

src/NHibernate/SqlCommand/SqlString.cs

@@ -393,6 +393,8 @@ public bool EndsWithCaseInsensitive(string value)
 				&& IndexOf(value, _length - value.Length, value.Length, StringComparison.InvariantCultureIgnoreCase) >= 0;
 		}
 
+		internal IList<Parameter> Parameters => _parameters.Values;
+
 		public IEnumerable<Parameter> GetParameters()
 		{
 			return _parameters.Values;