yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes SQL IN expression

Browse Source
This commit is contained in:
Shannon
2017-02-08 22:25:07 +11:00
parent fb02a5b06d
commit e06cda98e9
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
View File

@@ -540,8 +540,9 @@ namespace Umbraco.Core.Persistence.Querying
//special case, if it is 'Contains' and the argumet that Contains is being called on is
//Enumerable and the methodArgs is the actual member access, then it's an SQL IN claus
if (m.Arguments.Count == 2
&& m.Object == null
if (m.Object == null
&& m.Arguments[0].Type != typeof(string)
&& m.Arguments.Count == 2
&& methodArgs.Length == 1
&& methodArgs[0].NodeType == ExpressionType.MemberAccess
&& TypeHelper.IsTypeAssignableFrom<IEnumerable>(m.Arguments[0].Type))

17
src/Umbraco.Tests/Persistence/Querying/ExpressionTests.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Linq.Expressions;
using Moq;
using NUnit.Framework;
@@ -156,5 +157,21 @@ namespace Umbraco.Tests.Persistence.Querying
Assert.AreEqual("@test", modelToSqlExpressionHelper.GetSqlParameters()[2]);
}
[Test]
public void Sql_In()
{
var userNames = new[] {"hello@world.com", "blah@blah.com"};
Expression<Func<IUser, bool>> predicate = user => userNames.Contains(user.Username);
var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>();
var result = modelToSqlExpressionHelper.Visit(predicate);
Debug.Print("Model to Sql ExpressionHelper: \n" + result);
Assert.AreEqual("[umbracoUser].[userLogin] IN (@1,@2)", result);
Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[1]);
Assert.AreEqual("blah@blah.com", modelToSqlExpressionHelper.GetSqlParameters()[2]);
}
}
}