Merge pull request #12 from byerlikaya/bugfix_and_package_update

Bugfix and package update
byerlikaya · Jul 10, 2024 · 26859cd · 26859cd
2 parents 88772b0 + f5e99ed
commit 26859cd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/sample/Sample.Api/Sample.Api.csproj b/sample/Sample.Api/Sample.Api.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.1" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SmartWhere/SmartWhere.cs b/src/SmartWhere/SmartWhere.cs
@@ -24,7 +24,7 @@ public static IQueryable<T> Where<T>(this IQueryable<T> source, IWhereClause whe
     {
         var whereClauseProperties = whereClauseDto.GetWhereClauseProperties(out var valueData);
 
-        if (whereClauseProperties.IsNullOrNotAny())
+        if (whereClauseProperties.IsNullOrNotAny() || valueData.IsNull())
             return source.Where(x => true);
 
         Expression comparison = null;
@@ -195,7 +195,6 @@ private static Expression ComplexComparison<T>(
 
         foreach (var (propertyInfo, propertyType) in properties)
         {
-
             if (!propertyType.Namespace!.StartsWith("System") ||
                 propertyInfo.PropertyType!.IsEnumarableType())
             {
@@ -290,9 +289,7 @@ private static MemberExpression SetLastMember(
         Expression parameterExpression)
     {
         if (lastMember.IsNull())
-        {
             return Expression.Property(baseParameter, propertyInfo.Name);
-        }
 
         return currentType.IsEnumarableType()
             ? Expression.MakeMemberAccess(parameterExpression, propertyInfo)
@@ -312,9 +309,7 @@ private static ParameterExpression SetParameterExpression(
         ParameterExpression parameterExpression)
     {
         if (currentType.IsEnumarableType())
-        {
             return Expression.Parameter(type!, type!.Name.ToLower());
-        }
 
         return parameterExpression.IsNull()
             ? Expression.Parameter(type, type.Name.ToLower())

diff --git a/src/SmartWhere/SmartWhere.csproj b/src/SmartWhere/SmartWhere.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>SmartWhere</PackageId>
-    <Version>2.2.1</Version>
+    <Version>2.2.2</Version>
     <Authors>Barış Yerlikaya</Authors>
     <Company>Barış Yerlikaya</Company>
     <Product>SmartWhere</Product>

diff --git a/tests/SmartWhere.Tests/SmartWhere.Test.csproj b/tests/SmartWhere.Tests/SmartWhere.Test.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.8.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>