Merge pull request #106 from tghamm/feature/1.3.0

Feature/1.3.0

Author: tghamm

Castle.DynamicLinqQueryBuilder.SystemTextJson/Castle.DynamicLinqQueryBuilder.SystemTextJson.csproj

@@ -12,12 +12,12 @@
 	  <FileAlignment>512</FileAlignment>
 	  <TargetFrameworkProfile />
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	  <Version>1.2.9</Version>
+	  <Version>1.3.0</Version>
 	  <Authors>Grant Hamm</Authors>
 	  <Company>N/A</Company>
 	  <Product>Dynamic Linq Query Builder - System.Text.Json Extension</Product>
 	  <Description>A companion package for those using System.Text.Json</Description>
-	  <Copyright>Copyright Grant Hamm 2022</Copyright>
+	  <Copyright>Copyright Grant Hamm 2023</Copyright>
 	  <PackageLicenseUrl>https://github.com/tghamm/dynamic-linq-query-builder/blob/master/LICENSE.md</PackageLicenseUrl>
 	  <PackageProjectUrl>https://github.com/tghamm/dynamic-linq-query-builder/</PackageProjectUrl>
 	  <RepositoryUrl>https://github.com/tghamm/dynamic-linq-query-builder/</RepositoryUrl>

Castle.DynamicLinqQueryBuilder.Tests/Rules/JsonNetFilterRuleTests.cs

@@ -3350,6 +3350,14 @@ private class DictionaryClass
 
         }
 
+        private class DictionaryClassFail
+        {
+            public DictionaryClassFail() { DynamicData = new Dictionary<int, object>(); }
+
+            public Dictionary<int, object> DynamicData { get; set; }
+
+        }
+
         private class DictionaryClassConcrete
         {
             public DictionaryClassConcrete() { DynamicData = new Dictionary<string, DataValue>(); }
@@ -3431,6 +3439,40 @@ public void DictionaryExpression_Test()
             var resultList = result.ToList();
             Assert.AreEqual(resultList[0].DynamicData["test"], "test");
         }
+
+        [Test]
+        public void DictionaryExpression_Test_Fail()
+        {
+            var rule = new JsonNetFilterRule
+            {
+                Condition = "and",
+                Rules = new List<JsonNetFilterRule>
+                {
+                    new JsonNetFilterRule
+                    {
+                        Condition = "and",
+                        Field = "DynamicData.test",
+                        Id = "Id",
+                        Operator = "equal",
+                        Type = "string",
+                        Value = "test"
+                    }
+                }
+            };
+            var d1 = new DictionaryClassFail();
+            d1.DynamicData.Add(1, "test");
+            var d2 = new DictionaryClassFail();
+            d2.DynamicData.Add(1, "NotTest");
+
+            
+
+            ExceptionAssert.Throws<NotSupportedException>(() =>
+            {
+                var result = new List<DictionaryClassFail> { d1, d2 }.AsQueryable().BuildQuery(rule,
+                    new BuildExpressionOptions());
+            });
+            
+        }
         #endregion
     }
 }

Castle.DynamicLinqQueryBuilder/Castle.DynamicLinqQueryBuilder.csproj

@@ -12,12 +12,12 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.2.9</Version>
+    <Version>1.3.0</Version>
     <Authors>Grant Hamm</Authors>
     <Company>N/A</Company>
     <Product>Dynamic Linq Query Builder</Product>
     <Description>A simple dynamic expression-tree query builder.  You pass it a nested collection of filters for an object, and it materializes a query capable of acting as the filter to an arbitrary collection.</Description>
-    <Copyright>Copyright Grant Hamm 2022</Copyright>
+    <Copyright>Copyright Grant Hamm 2023</Copyright>
     <PackageLicenseUrl>https://github.com/tghamm/dynamic-linq-query-builder/blob/master/LICENSE.md</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/tghamm/dynamic-linq-query-builder/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/tghamm/dynamic-linq-query-builder/</RepositoryUrl>

README.md

@@ -3,11 +3,12 @@
 
 `dynamic-linq-query-builder` is a small library that allows any `.Net` framework class collection to be filtered dynamically at runtime.  
 
-Features (v1.2.9)
+Features (v1.3.0)
 --
 * Generates an `IQueryable` from any collection and filter combination
 * Capable of complex, grouped queries against as many fields as you want
 * Supports nested objects and collections via dot notation
+* Supports `Dictionary<string, object>` collections
 * Supports a number of operators for each type
   * in
   * not in