Change to navigation filter

FoundatioFx · Mar 19, 2024 · ed80f23 · ed80f23
1 parent 7124730
commit ed80f23
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/Foundatio.Parsers.SqlQueries/SqlQueryParser.cs b/src/Foundatio.Parsers.SqlQueries/SqlQueryParser.cs
@@ -118,7 +118,7 @@ private void AddEntityFields(List<EntityFieldInfo> fields, IEntityType entityTyp
 
         foreach (var nav in entityType.GetNavigations())
         {
-            if (visited.Contains(nav.TargetEntityType) || !Configuration.EntityTypeFilter(nav.TargetEntityType))
+            if (visited.Contains(nav.TargetEntityType) || !Configuration.EntityTypeNavigationFilter(nav))
                 continue;
 
             AddEntityFields(fields, nav.TargetEntityType, visited, prefix + nav.Name + ".");

diff --git a/src/Foundatio.Parsers.SqlQueries/SqlQueryParserConfiguration.cs b/src/Foundatio.Parsers.SqlQueries/SqlQueryParserConfiguration.cs
@@ -23,7 +23,7 @@ public SqlQueryParserConfiguration() {
 
     public QueryFieldResolver FieldResolver { get; private set; }
     public EntityTypePropertyFilter EntityTypePropertyFilter { get; private set; } = static _ => true;
-    public EntityTypeFilter EntityTypeFilter { get; private set; } = static _ => true;
+    public EntityTypeNavigationFilter EntityTypeNavigationFilter { get; private set; } = static _ => true;
     public IncludeResolver IncludeResolver { get; private set; }
     public QueryValidationOptions ValidationOptions { get; private set; }
     public ChainedQueryVisitor SortVisitor { get; } = new();
@@ -47,6 +47,11 @@ public SqlQueryParserConfiguration UseEntityTypePropertyFilter(EntityTypePropert
         return this;
     }
 
+    public SqlQueryParserConfiguration UseEntityTypeNavigationFilter(EntityTypeNavigationFilter filter) {
+        EntityTypeNavigationFilter = filter;
+        return this;
+    }
+
     public SqlQueryParserConfiguration UseFieldResolver(QueryFieldResolver resolver, int priority = 10) {
         FieldResolver = resolver;
         ReplaceVisitor<FieldResolverQueryVisitor>(new FieldResolverQueryVisitor(resolver), priority);
@@ -227,5 +232,5 @@ public SqlQueryParserConfiguration AddAggregationVisitorAfter<T>(IChainableQuery
     #endregion
 }
 
-public delegate bool EntityTypeFilter(IEntityType type);
+public delegate bool EntityTypeNavigationFilter(INavigation navigation);
 public delegate bool EntityTypePropertyFilter(IProperty property);
diff --git a/tests/Foundatio.Parsers.SqlQueries.Tests/SampleContext.cs b/tests/Foundatio.Parsers.SqlQueries.Tests/SampleContext.cs
@@ -43,6 +43,7 @@ public class Employee {
     public int CompanyId { get; set; }
     public Company Company { get; set; }
     public List<DataValue> DataValues { get; set; }
+    public DateTime Created { get; set; } = DateTime.Now;
 }
 
 public class Company {