Add optional query expression cleanup. Write saner expressions by collapsing boolean operators

Author: rhuijben

.editorconfig

@@ -98,3 +98,6 @@ dotnet_diagnostic.IDE0061.severity = none
 
 # IDE0090: Use 'new(...)'
 dotnet_diagnostic.IDE0090.severity = silent
+
+# IDE0023: Use block body for conversion operator
+dotnet_diagnostic.IDE0023.severity = none

.github/workflows/build.yml

@@ -83,8 +83,16 @@ jobs:
       - name: restore
         run: dotnet restore
 
+      - name: Set version variables
+        id: version
+        run: |
+          COMMIT_DATE=$(git log -1 --format='%ai' | cut -d' ' -f1)
+          DATE=$(echo $COMMIT_DATE | awk -F'-' '{print $1"."$2$3}')
+          BUILD_NUM=$(printf "%d" $(( ${{ github.run_number }} % 60000 )))
+          echo "version=1.${DATE}.${BUILD_NUM}" >> $GITHUB_OUTPUT
+
       - name: build
-        run: dotnet build -c Release --no-restore
+        run: dotnet build -c Release -p:Version="${{ steps.version.outputs.version }}" -p:PackagePrefix=AmpScm. --no-restore
 
       - name: Run tests for .NET 10.0 with coverage
         run: |
@@ -96,13 +104,6 @@ jobs:
             dotnet test -c Release -f net10.0 --no-build \
               --report-github --report-github-summary-include-passed=false
 
-      - name: Set version variables
-        id: version
-        run: |
-          DATE=$(date +'%Y.%02m%02d')
-          BUILD_NUM=$(printf "%d" $(( ${{ github.run_number }} % 60000 )))
-          echo "version=1.${DATE}.${BUILD_NUM}" >> $GITHUB_OUTPUT
-
       - name: Pack packages
         run: dotnet pack -c Release -p:Version="${{ steps.version.outputs.version }}" -p:PackagePrefix=AmpScm. -o release
 

src/RepoDb.Core.UnitTests/BaseRepositoryDisposalTest.cs

@@ -1,7 +1,7 @@
 using RepoDb.Enumerations;
 using RepoDb.UnitTests.CustomObjects;
 
-namespace RepoDb.Core.UnitTests;
+namespace RepoDb.UnitTests;
 
 [TestClass]
 public class BaseRepositoryDisposalTest

src/RepoDb.Core.UnitTests/DbRepositoryDisposalTest.cs

@@ -1,7 +1,7 @@
 using RepoDb.Enumerations;
 using RepoDb.UnitTests.CustomObjects;
 
-namespace RepoDb.Core.UnitTests;
+namespace RepoDb.UnitTests;
 
 [TestClass]
 public class DbRepositoryDisposalTest

src/RepoDb.Core.UnitTests/DbSessionDisposalTest.cs

@@ -1,7 +1,7 @@
 using System.Data.Common;
 using RepoDb.UnitTests.CustomObjects;
 
-namespace RepoDb.Core.UnitTests;
+namespace RepoDb.UnitTests;
 
 [TestClass]
 public class DbSessionDisposalTest

src/RepoDb.Core.UnitTests/Equalities/QueryGroupEqualityTest.cs

@@ -120,15 +120,10 @@ public void TestQueryGroupHashCodeEqualityForExpressions()
     [TestMethod]
     public void TestQueryGroupHashCodeEqualityForCollidedExpressions()
     {
-        // Prepare
         var objA = QueryGroup.Parse<EntityClass>(c => c.Id == 1 && c.Value != 1);
         var objB = QueryGroup.Parse<EntityClass>(c => c.Id != 1 && c.Value == 1);
 
-        // Act
-        var equal = objA.GetHashCode() == objB.GetHashCode();
-
-        // Assert
-        Assert.IsFalse(equal);
+        Assert.AreNotEqual(objA.GetHashCode(), objB.GetHashCode());
         Assert.HasCount(objA.QueryFields.Count, objB.QueryFields);
     }
 
@@ -139,14 +134,12 @@ public void TestQueryGroupHashCodeEqualityForCollidedExpressions2()
         var objA = QueryGroup.Parse<EntityClass>(c => c.Id == 1 && !(c.Value != 1));
         var objB = QueryGroup.Parse<EntityClass>(c => c.Id != 1 && c.Value == 1);
 
-        // Act
-        var equal = objA.GetHashCode() == objB.GetHashCode();
-
         // Assert
-        Assert.IsFalse(equal);
+        Assert.AreNotEqual(objA.GetHashCode(), objB.GetHashCode());
+
         //Assert.AreEqual(objA.QueryGroups?.Count, objB.QueryGroups?.Count);
 
-        Assert.AreEqual("(([Id] = @Id) AND NOT (([Value] <> @Value)))", objA.GetString(_dbSetting));
+        Assert.AreEqual("([Id] = @Id AND [Value] = @Value)", objA.GetString(_dbSetting));
         Assert.AreEqual("([Id] <> @Id AND [Value] = @Value)", objB.GetString(_dbSetting));
     }
 

src/RepoDb.Core.UnitTests/Extensions/ListExtensionTest.cs

@@ -1,6 +1,6 @@
 using RepoDb.Extensions;
 
-namespace RepoDb.Core.UnitTests;
+namespace RepoDb.UnitTests;
 
 [TestClass]
 public class ListExtensionTest

src/RepoDb.Core.UnitTests/Extensions/StringExtensionTest.cs

@@ -1,7 +1,7 @@
 using RepoDb.Extensions;
 using RepoDb.UnitTests.CustomObjects;
 
-namespace RepoDb.Core.UnitTests;
+namespace RepoDb.UnitTests;
 
 [TestClass]
 public class StringExtensionTest

src/RepoDb.Core.UnitTests/Interfaces/IStatementBuilderForDbConnectionTest.cs

@@ -1,6 +1,5 @@
 using Moq;
-using RepoDb.Context.Caches;
-using RepoDb.Contexts.Caches;
+using RepoDb.Contexts;
 using RepoDb.Enumerations;
 using RepoDb.Interfaces;
 using RepoDb.UnitTests.CustomObjects;

src/RepoDb.Core.UnitTests/Others/ToTypeTests.cs

@@ -1,4 +1,4 @@
-namespace RepoDb.Core.UnitTests.Others;
+namespace RepoDb.UnitTests.Others;
 
 [TestClass]
 public class ToTypeTests