Skip to content

Commit 881c813

Browse files
committed
Merge branch 'pr-23-fix'
2 parents 9b77304 + 49e6f30 commit 881c813

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Extensions/Xtensive.Orm.BulkOperations/Internals/SetOperation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Linq.Expressions;
@@ -140,7 +140,7 @@ private void AddConstantValue(AddValueContext addContext)
140140
{
141141
SqlTableColumn column = SqlDml.TableColumn(addContext.Statement.Table, addContext.Field.Column.Name);
142142
SqlExpression value;
143-
object constant = FastExpression.Lambda(addContext.Lambda.Body, null).Compile().DynamicInvoke();
143+
object constant = FastExpression.Lambda(addContext.Lambda.Body).Compile().DynamicInvoke();
144144
if (constant==null)
145145
value = SqlDml.Null;
146146
else {

Orm/Xtensive.Orm/Linq/FastExpression.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,20 @@ public static class FastExpression
2626
/// <returns>Constructed lambda expression.</returns>
2727
public static LambdaExpression Lambda(Type delegateType, Expression body, params ParameterExpression[] parameters)
2828
{
29-
return LambdaExpressionFactory.Instance.CreateLambda(delegateType, body, parameters);
29+
return LambdaExpressionFactory.Instance.CreateLambda(delegateType, body, parameters ?? Array.Empty<ParameterExpression>());
3030
}
3131

3232
/// <summary>
3333
/// Generates <see cref="LambdaExpression"/> faster than <see cref="Expression.Lambda(Type,Expression,ParameterExpression[])"/>.
3434
/// </summary>
35-
/// <param name="delegateType">A type that represents a delegate type.</param>
35+
/// <typeparam name="TDelegate">A type that represents a delegate type.</typeparam>
3636
/// <param name="body">The body of lambda expression.</param>
3737
/// <param name="parameters">The parameters of lambda expression.</param>
3838
/// <returns>Constructed lambda expression.</returns>
3939
public static Expression<TDelegate> Lambda<TDelegate>(Expression body, params ParameterExpression[] parameters)
4040
{
41-
return (Expression<TDelegate>) LambdaExpressionFactory.Instance.CreateLambda(typeof(TDelegate), body, parameters);
41+
return (Expression<TDelegate>) LambdaExpressionFactory.Instance
42+
.CreateLambda(typeof(TDelegate), body, parameters ?? Array.Empty<ParameterExpression>());
4243
}
4344

4445
/// <summary>
@@ -61,7 +62,7 @@ public static LambdaExpression Lambda(Type delegateType, Expression body, IEnume
6162
/// <returns>Constructed lambda expression.</returns>
6263
public static LambdaExpression Lambda(Expression body, params ParameterExpression[] parameters)
6364
{
64-
return LambdaExpressionFactory.Instance.CreateLambda(body, parameters);
65+
return LambdaExpressionFactory.Instance.CreateLambda(body, parameters ?? Array.Empty<ParameterExpression>());
6566
}
6667

6768
/// <summary>

0 commit comments

Comments
 (0)