add filter to Columns query builder

loresoft · Sep 14, 2023 · cb59220 · cb59220
1 parent 9961fa9
commit cb59220
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/FluentCommand/Query/SelectEntityBuilder.cs b/src/FluentCommand/Query/SelectEntityBuilder.cs
@@ -87,7 +87,8 @@ public SelectEntityBuilder(IQueryGenerator queryGenerator, List<QueryParameter>
     }
 
     public SelectEntityBuilder<TEntity> Columns(
-        string tableAlias = null)
+        string tableAlias = null,
+        Func<IMemberAccessor, bool> filter = null)
     {
         var properties = _typeAccessor.GetProperties();
 
@@ -96,6 +97,9 @@ public SelectEntityBuilder(IQueryGenerator queryGenerator, List<QueryParameter>
             if (property.IsNotMapped)
                 continue;
 
+            if (filter != null && !filter(property))
+                continue;
+
             // alias column as property name if don't match
             if (property.Name == property.Column)
                 Column(property.Column, tableAlias);
@@ -107,7 +111,8 @@ public SelectEntityBuilder(IQueryGenerator queryGenerator, List<QueryParameter>
     }
 
     public SelectEntityBuilder<TEntity> Columns<TModel>(
-        string tableAlias = null)
+        string tableAlias = null,
+        Func<IMemberAccessor, bool> filter = null)
     {
         var typeAccessor = TypeAccessor.GetAccessor(typeof(TModel));
         var properties = typeAccessor.GetProperties();
@@ -117,6 +122,9 @@ public SelectEntityBuilder(IQueryGenerator queryGenerator, List<QueryParameter>
             if (property.IsNotMapped)
                 continue;
 
+            if (filter != null && !filter(property))
+                continue;
+
             // alias column as property name if don't match
             if (property.Name == property.Column)
                 Column(property.Column, tableAlias);

diff --git a/test/FluentCommand.Tests/Query/SelectBuilderTest.cs b/test/FluentCommand.Tests/Query/SelectBuilderTest.cs
@@ -272,6 +272,21 @@ public async System.Threading.Tasks.Task SelectEntityJoinBuilder()
         await Verifier.Verify(sql).UseDirectory("Snapshots");
     }
 
+    [Fact]
+    public async System.Threading.Tasks.Task SelectEntityFilterBuilder()
+    {
+        var sqlProvider = new SqlServerGenerator();
+        var parameters = new List<QueryParameter>();
+
+        var builder = new SelectEntityBuilder<User>(sqlProvider, parameters)
+            .Columns("t", p => p.Name != nameof(User.PasswordHash));
+
+        var queryStatement = builder.BuildStatement();
+
+        var sql = queryStatement.Statement;
+
+        await Verifier.Verify(sql).UseDirectory("Snapshots");
+    }
     private class EntityAlias
     {
         [Column("EntityId")]

diff --git a/...entCommand.Tests/Query/Snapshots/SelectBuilderTest.SelectEntityFilterBuilder.verified.txt b/...entCommand.Tests/Query/Snapshots/SelectBuilderTest.SelectEntityFilterBuilder.verified.txt
@@ -0,0 +1,2 @@
+SELECT [t].[Id], [t].[EmailAddress], [t].[IsEmailAddressConfirmed], [t].[DisplayName], [t].[FirstName], [t].[LastName], [t].[ResetHash], [t].[InviteHash], [t].[AccessFailedCount], [t].[LockoutEnabled], [t].[LockoutEnd], [t].[LastLogin], [t].[IsDeleted], [t].[Created], [t].[CreatedBy], [t].[Updated], [t].[UpdatedBy], [t].[RowVersion]
+FROM [User];