Add entity type filter

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

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Foundatio.Parsers.SqlQueries/SqlQueryParser.cs b/src/Foundatio.Parsers.SqlQueries/SqlQueryParser.cs
@@ -79,14 +79,17 @@ public SqlQueryVisitorContext GetContext(IEntityType entityType)
             _entityFieldCache.TryAdd(entityType, fields);
         }
 
+        // make copy of fields list to avoid modifying the cached list
+        fields = fields.ToList();
+
         var validationOptions = new QueryValidationOptions();
         foreach (string field in fields.Select(f => f.Field))
             validationOptions.AllowedFields.Add(field);
 
         Configuration.SetValidationOptions(validationOptions);
         return new SqlQueryVisitorContext
         {
-            Fields = fields.ToList(),
+            Fields = fields,
             ValidationOptions = validationOptions
         };
     }
@@ -115,7 +118,7 @@ private void AddEntityFields(List<EntityFieldInfo> fields, IEntityType entityTyp
 
         foreach (var nav in entityType.GetNavigations())
         {
-            if (visited.Contains(nav.TargetEntityType))
+            if (visited.Contains(nav.TargetEntityType) || !Configuration.EntityTypeFilter(nav.TargetEntityType))
                 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,6 +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 IncludeResolver IncludeResolver { get; private set; }
     public QueryValidationOptions ValidationOptions { get; private set; }
     public ChainedQueryVisitor SortVisitor { get; } = new();
@@ -226,4 +227,5 @@ public SqlQueryParserConfiguration AddAggregationVisitorAfter<T>(IChainableQuery
     #endregion
 }
 
+public delegate bool EntityTypeFilter(IEntityType type);
 public delegate bool EntityTypePropertyFilter(IProperty property);