From cbf67592745038f8ef96a07e87ae328e52dcf078 Mon Sep 17 00:00:00 2001 From: Tilmann Bach Date: Sat, 13 Feb 2021 13:16:00 +0100 Subject: [PATCH 1/2] fix(processor): fixes AND expression when combining multiple conditions via outer expression fixes #115, ref #101 --- Sieve/Services/SieveProcessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sieve/Services/SieveProcessor.cs b/Sieve/Services/SieveProcessor.cs index f04c2b2..b8d5df4 100644 --- a/Sieve/Services/SieveProcessor.cs +++ b/Sieve/Services/SieveProcessor.cs @@ -261,7 +261,7 @@ namespace Sieve.Services { continue; } - outerExpression = Expression.And(outerExpression, innerExpression); + outerExpression = Expression.AndAlso(outerExpression, innerExpression); } return outerExpression == null ? result From 11938c9b8af416547350d105075e859a5a26f230 Mon Sep 17 00:00:00 2001 From: Tilmann Bach Date: Sat, 13 Feb 2021 13:19:57 +0100 Subject: [PATCH 2/2] fix(processor): fixes OR combination from bitwise or to sql query OR fixes #101 --- Sieve/Services/SieveProcessor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sieve/Services/SieveProcessor.cs b/Sieve/Services/SieveProcessor.cs index b8d5df4..ab363fc 100644 --- a/Sieve/Services/SieveProcessor.cs +++ b/Sieve/Services/SieveProcessor.cs @@ -237,7 +237,7 @@ namespace Sieve.Services } else { - innerExpression = Expression.Or(innerExpression, expression); + innerExpression = Expression.OrElse(innerExpression, expression); } } }