GenerateStringContains(Expression left, Expression right)

Author: StefH

src/System.Linq.Dynamic.Core/Parser/ExpressionHelper.cs

@@ -132,14 +132,12 @@ public Expression GenerateStringConcat(Expression left, Expression right)
 
     public Expression GenerateStringContains(Expression left, Expression right)
     {
-        Expression searchValue = left;
+        // if (left.Type == typeof(char) && left is ConstantExpression { Value: char character })
+        // {
+        //     searchValue = Expression.Constant(character.ToString(), typeof(string));
+        // }
 
-        if (left.Type == typeof(char) && left is ConstantExpression { Value: char character })
-        {
-            searchValue = Expression.Constant(character.ToString(), typeof(string));
-        }
-
-        return Expression.Call(right, _containsMethod, searchValue);
+        return Expression.Call(left, _containsMethod, right);
     }
 
     public Expression GenerateSubtract(Expression left, Expression right)

src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs

@@ -414,7 +414,7 @@ private Expression ParseIn()
                 {
                     if (right.Type == typeof(string))
                     {
-                        accumulate = _expressionHelper.GenerateStringContains(left, right);
+                        accumulate = _expressionHelper.GenerateStringContains(right, left);
                     }
                     else
                     {

test/System.Linq.Dynamic.Core.Tests/EntitiesTests.In.cs

@@ -27,7 +27,7 @@ public void Entities_Where_In_And()
 
         // Act
         var test = _context.Blogs.Include(b => b.Posts)
-            .Where(@"BlogId in (1000, 1001, 1002) and Name in (""Blog1"", ""Blog2"") && Name.Contains('o') && Name.Contains(""g"")")
+            .Where(@"BlogId in (1000, 1001, 1002) and Name in (""Blog1"", ""Blog2"") && 'o' in Name && Name.Contains(""g"") && ""l"" in Name")
             .ToArray();
 
         // Assert