(#46) Flatten Nested Properties

phongnguyend · web-flow · commit e6d28020aedf · 2026-03-03T10:00:44.000+07:00
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkDelete/BulkDeleteBuilder.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkDelete/BulkDeleteBuilder.cs
@@ -24,19 +24,22 @@ public BulkDeleteBuilder(ConnectionContext connectionContext)
     public BulkDeleteBuilder<T> ToTable(TableInfor<T> table)
     {
         _table = table;
+        _deleteKeys = _table?.FlattenProperties(_deleteKeys) ?? _deleteKeys;
         return this;
     }
 
     public BulkDeleteBuilder<T> WithId(IReadOnlyCollection<string> idColumns)
     {
         _deleteKeys = idColumns;
+        _deleteKeys = _table?.FlattenProperties(_deleteKeys) ?? _deleteKeys;
         return this;
     }
 
     public BulkDeleteBuilder<T> WithId(Expression<Func<T, object>> idSelector)
     {
         var idColumn = idSelector.Body.GetMemberName();
         _deleteKeys = string.IsNullOrEmpty(idColumn) ? idSelector.Body.GetMemberNames() : new List<string> { idColumn };
+        _deleteKeys = _table?.FlattenProperties(_deleteKeys) ?? _deleteKeys;
         return this;
     }
 
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkInsert/BulkInsertBuilder.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkInsert/BulkInsertBuilder.cs
@@ -30,18 +30,21 @@ public BulkInsertBuilder<T> ToTable(TableInfor<T> table)
         _table = table;
         _outputIdColumn = table?.OutputId?.Name;
         _outputIdMode = table?.OutputId?.Mode ?? OutputIdMode.ServerGenerated;
+        _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;
         return this;
     }
 
     public BulkInsertBuilder<T> WithColumns(IReadOnlyCollection<string> columnNames)
     {
         _columnNames = columnNames;
+        _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;
         return this;
     }
 
     public BulkInsertBuilder<T> WithColumns(Expression<Func<T, object>> columnNamesSelector)
     {
         _columnNames = columnNamesSelector.Body.GetMemberNames().ToArray();
+        _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;
         return this;
     }
 
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMatch/BulkMatchBuilder.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMatch/BulkMatchBuilder.cs
@@ -26,31 +26,37 @@ public BulkMatchBuilder(ConnectionContext connectionContext)
     public BulkMatchBuilder<T> WithTable(TableInfor<T> table)
     {
         _table = table;
+        _matchKeys = _table?.FlattenProperties(_matchKeys) ?? _matchKeys;
+        _returnedColumns = _table?.FlattenProperties(_returnedColumns) ?? _returnedColumns;
         return this;
     }
 
     public BulkMatchBuilder<T> WithMatchedColumns(IReadOnlyCollection<string> matchedColumns)
     {
         _matchKeys = matchedColumns;
+        _matchKeys = _table?.FlattenProperties(_matchKeys) ?? _matchKeys;
         return this;
     }
 
     public BulkMatchBuilder<T> WithMatchedColumns(Expression<Func<T, object>> matchedColumnsSelector)
     {
         var matchedColumn = matchedColumnsSelector.Body.GetMemberName();
         _matchKeys = string.IsNullOrEmpty(matchedColumn) ? matchedColumnsSelector.Body.GetMemberNames() : new List<string> { matchedColumn };
+        _matchKeys = _table?.FlattenProperties(_matchKeys) ?? _matchKeys;
         return this;
     }
 
     public BulkMatchBuilder<T> WithReturnedColumns(IReadOnlyCollection<string> returnedColumns)
     {
         _returnedColumns = returnedColumns;
+        _returnedColumns = _table?.FlattenProperties(_returnedColumns) ?? _returnedColumns;
         return this;
     }
 
     public BulkMatchBuilder<T> WithReturnedColumns(Expression<Func<T, object>> returnedColumnsSelector)
     {
         _returnedColumns = returnedColumnsSelector.Body.GetMemberNames().ToArray();
+        _returnedColumns = _table?.FlattenProperties(_returnedColumns) ?? _returnedColumns;
         return this;
     }
 
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMerge/BulkMergeBuilder.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMerge/BulkMergeBuilder.cs
@@ -31,43 +31,53 @@ public BulkMergeBuilder<T> ToTable(TableInfor<T> table)
 
         _outputIdColumn = table?.OutputId?.Name;
 
+        _mergeKeys = _table?.FlattenProperties(_mergeKeys) ?? _mergeKeys;
+        _updateColumnNames = _table?.FlattenProperties(_updateColumnNames) ?? _updateColumnNames;
+        _insertColumnNames = _table?.FlattenProperties(_insertColumnNames) ?? _insertColumnNames;
+
         return this;
     }
 
     public BulkMergeBuilder<T> WithId(IReadOnlyCollection<string> idColumns)
     {
         _mergeKeys = idColumns;
+        _mergeKeys = _table?.FlattenProperties(_mergeKeys) ?? _mergeKeys;
         return this;
     }
 
     public BulkMergeBuilder<T> WithId(Expression<Func<T, object>> idSelector)
     {
         var idColumn = idSelector.Body.GetMemberName();
         _mergeKeys = string.IsNullOrEmpty(idColumn) ? idSelector.Body.GetMemberNames() : new List<string> { idColumn };
+        _mergeKeys = _table?.FlattenProperties(_mergeKeys) ?? _mergeKeys;
         return this;
     }
 
     public BulkMergeBuilder<T> WithUpdateColumns(IReadOnlyCollection<string> updateColumnNames)
     {
         _updateColumnNames = updateColumnNames;
+        _updateColumnNames = _table?.FlattenProperties(_updateColumnNames) ?? _updateColumnNames;
         return this;
     }
 
     public BulkMergeBuilder<T> WithUpdateColumns(Expression<Func<T, object>> updateColumnNamesSelector)
     {
         _updateColumnNames = updateColumnNamesSelector.Body.GetMemberNames().ToArray();
+        _updateColumnNames = _table?.FlattenProperties(_updateColumnNames) ?? _updateColumnNames;
         return this;
     }
 
     public BulkMergeBuilder<T> WithInsertColumns(IReadOnlyCollection<string> insertColumnNames)
     {
         _insertColumnNames = insertColumnNames;
+        _insertColumnNames = _table?.FlattenProperties(_insertColumnNames) ?? _insertColumnNames;
         return this;
     }
 
     public BulkMergeBuilder<T> WithInsertColumns(Expression<Func<T, object>> insertColumnNamesSelector)
     {
         _insertColumnNames = insertColumnNamesSelector.Body.GetMemberNames().ToArray();
+        _insertColumnNames = _table?.FlattenProperties(_insertColumnNames) ?? _insertColumnNames;
         return this;
     }
 
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkUpdate/BulkUpdateBuilder.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkUpdate/BulkUpdateBuilder.cs
@@ -26,31 +26,37 @@ public BulkUpdateBuilder(ConnectionContext connectionContext)
     public BulkUpdateBuilder<T> ToTable(TableInfor<T> table)
     {
         _table = table;
+        _updateKeys = _table?.FlattenProperties(_updateKeys) ?? _updateKeys;
+        _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;
         return this;
     }
 
     public BulkUpdateBuilder<T> WithId(IReadOnlyCollection<string> idColumns)
     {
         _updateKeys = idColumns;
+        _updateKeys = _table?.FlattenProperties(_updateKeys) ?? _updateKeys;
         return this;
     }
 
     public BulkUpdateBuilder<T> WithId(Expression<Func<T, object>> idSelector)
     {
         var idColumn = idSelector.Body.GetMemberName();
         _updateKeys = string.IsNullOrEmpty(idColumn) ? idSelector.Body.GetMemberNames() : new List<string> { idColumn };
+        _updateKeys = _table?.FlattenProperties(_updateKeys) ?? _updateKeys;
         return this;
     }
 
     public BulkUpdateBuilder<T> WithColumns(IReadOnlyCollection<string> columnNames)
     {
         _columnNames = columnNames;
+        _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;
         return this;
     }
 
     public BulkUpdateBuilder<T> WithColumns(Expression<Func<T, object>> columnNamesSelector)
     {
         _columnNames = columnNamesSelector.Body.GetMemberNames().ToArray();
+        _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;
         return this;
     }
 
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/TableInfor.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/TableInfor.cs
@@ -101,6 +101,43 @@ public string CreateSetClause(string prop, Func<SetClauseContext, string> config
 
         return $"{left} = {right}";
     }
+
+    public IReadOnlyCollection<string> FlattenProperties(IReadOnlyCollection<string> propertyNames)
+    {
+        if (propertyNames == null || propertyNames.Count == 0)
+        {
+            return propertyNames;
+        }
+
+        if (InsertablePropertyNames == null || InsertablePropertyNames.Count == 0)
+        {
+            return propertyNames;
+        }
+
+        var flattenedProperties = new HashSet<string>(StringComparer.Ordinal);
+
+        foreach (var prop in propertyNames)
+        {
+            var prefix = prop + ".";
+            var foundNested = false;
+
+            foreach (var insertableProp in InsertablePropertyNames)
+            {
+                if (insertableProp.StartsWith(prefix, StringComparison.Ordinal))
+                {
+                    flattenedProperties.Add(insertableProp);
+                    foundNested = true;
+                }
+            }
+
+            if (!foundNested)
+            {
+                flattenedProperties.Add(prop);
+            }
+        }
+
+        return flattenedProperties;
+    }
 }
 
 public abstract class TableInfor<T> : TableInfor

Original file line number	Diff line number	Diff line change
`@@ -24,19 +24,22 @@ public BulkDeleteBuilder(ConnectionContext connectionContext)`
`24`	`24`	`public BulkDeleteBuilder<T> ToTable(TableInfor<T> table)`
`25`	`25`	`{`
`26`	`26`	`_table = table;`
	`27`	`+ _deleteKeys = _table?.FlattenProperties(_deleteKeys) ?? _deleteKeys;`
`27`	`28`	`return this;`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`public BulkDeleteBuilder<T> WithId(IReadOnlyCollection<string> idColumns)`
`31`	`32`	`{`
`32`	`33`	`_deleteKeys = idColumns;`
	`34`	`+ _deleteKeys = _table?.FlattenProperties(_deleteKeys) ?? _deleteKeys;`
`33`	`35`	`return this;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public BulkDeleteBuilder<T> WithId(Expression<Func<T, object>> idSelector)`
`37`	`39`	`{`
`38`	`40`	`var idColumn = idSelector.Body.GetMemberName();`
`39`	`41`	`_deleteKeys = string.IsNullOrEmpty(idColumn) ? idSelector.Body.GetMemberNames() : new List<string> { idColumn };`
	`42`	`+ _deleteKeys = _table?.FlattenProperties(_deleteKeys) ?? _deleteKeys;`
`40`	`43`	`return this;`
`41`	`44`	`}`
`42`	`45`
Original file line number	Diff line number	Diff line change
`@@ -30,18 +30,21 @@ public BulkInsertBuilder<T> ToTable(TableInfor<T> table)`
`30`	`30`	`_table = table;`
`31`	`31`	`_outputIdColumn = table?.OutputId?.Name;`
`32`	`32`	`_outputIdMode = table?.OutputId?.Mode ?? OutputIdMode.ServerGenerated;`
	`33`	`+ _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;`
`33`	`34`	`return this;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`public BulkInsertBuilder<T> WithColumns(IReadOnlyCollection<string> columnNames)`
`37`	`38`	`{`
`38`	`39`	`_columnNames = columnNames;`
	`40`	`+ _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;`
`39`	`41`	`return this;`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`public BulkInsertBuilder<T> WithColumns(Expression<Func<T, object>> columnNamesSelector)`
`43`	`45`	`{`
`44`	`46`	`_columnNames = columnNamesSelector.Body.GetMemberNames().ToArray();`
	`47`	`+ _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;`
`45`	`48`	`return this;`
`46`	`49`	`}`
`47`	`50`
Original file line number	Diff line number	Diff line change
`@@ -26,31 +26,37 @@ public BulkMatchBuilder(ConnectionContext connectionContext)`
`26`	`26`	`public BulkMatchBuilder<T> WithTable(TableInfor<T> table)`
`27`	`27`	`{`
`28`	`28`	`_table = table;`
	`29`	`+ _matchKeys = _table?.FlattenProperties(_matchKeys) ?? _matchKeys;`
	`30`	`+ _returnedColumns = _table?.FlattenProperties(_returnedColumns) ?? _returnedColumns;`
`29`	`31`	`return this;`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public BulkMatchBuilder<T> WithMatchedColumns(IReadOnlyCollection<string> matchedColumns)`
`33`	`35`	`{`
`34`	`36`	`_matchKeys = matchedColumns;`
	`37`	`+ _matchKeys = _table?.FlattenProperties(_matchKeys) ?? _matchKeys;`
`35`	`38`	`return this;`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`public BulkMatchBuilder<T> WithMatchedColumns(Expression<Func<T, object>> matchedColumnsSelector)`
`39`	`42`	`{`
`40`	`43`	`var matchedColumn = matchedColumnsSelector.Body.GetMemberName();`
`41`	`44`	`_matchKeys = string.IsNullOrEmpty(matchedColumn) ? matchedColumnsSelector.Body.GetMemberNames() : new List<string> { matchedColumn };`
	`45`	`+ _matchKeys = _table?.FlattenProperties(_matchKeys) ?? _matchKeys;`
`42`	`46`	`return this;`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`public BulkMatchBuilder<T> WithReturnedColumns(IReadOnlyCollection<string> returnedColumns)`
`46`	`50`	`{`
`47`	`51`	`_returnedColumns = returnedColumns;`
	`52`	`+ _returnedColumns = _table?.FlattenProperties(_returnedColumns) ?? _returnedColumns;`
`48`	`53`	`return this;`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`public BulkMatchBuilder<T> WithReturnedColumns(Expression<Func<T, object>> returnedColumnsSelector)`
`52`	`57`	`{`
`53`	`58`	`_returnedColumns = returnedColumnsSelector.Body.GetMemberNames().ToArray();`
	`59`	`+ _returnedColumns = _table?.FlattenProperties(_returnedColumns) ?? _returnedColumns;`
`54`	`60`	`return this;`
`55`	`61`	`}`
`56`	`62`
Original file line number	Diff line number	Diff line change
`@@ -31,43 +31,53 @@ public BulkMergeBuilder<T> ToTable(TableInfor<T> table)`
`31`	`31`
`32`	`32`	`_outputIdColumn = table?.OutputId?.Name;`
`33`	`33`
	`34`	`+ _mergeKeys = _table?.FlattenProperties(_mergeKeys) ?? _mergeKeys;`
	`35`	`+ _updateColumnNames = _table?.FlattenProperties(_updateColumnNames) ?? _updateColumnNames;`
	`36`	`+ _insertColumnNames = _table?.FlattenProperties(_insertColumnNames) ?? _insertColumnNames;`
	`37`	`+`
`34`	`38`	`return this;`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`public BulkMergeBuilder<T> WithId(IReadOnlyCollection<string> idColumns)`
`38`	`42`	`{`
`39`	`43`	`_mergeKeys = idColumns;`
	`44`	`+ _mergeKeys = _table?.FlattenProperties(_mergeKeys) ?? _mergeKeys;`
`40`	`45`	`return this;`
`41`	`46`	`}`
`42`	`47`
`43`	`48`	`public BulkMergeBuilder<T> WithId(Expression<Func<T, object>> idSelector)`
`44`	`49`	`{`
`45`	`50`	`var idColumn = idSelector.Body.GetMemberName();`
`46`	`51`	`_mergeKeys = string.IsNullOrEmpty(idColumn) ? idSelector.Body.GetMemberNames() : new List<string> { idColumn };`
	`52`	`+ _mergeKeys = _table?.FlattenProperties(_mergeKeys) ?? _mergeKeys;`
`47`	`53`	`return this;`
`48`	`54`	`}`
`49`	`55`
`50`	`56`	`public BulkMergeBuilder<T> WithUpdateColumns(IReadOnlyCollection<string> updateColumnNames)`
`51`	`57`	`{`
`52`	`58`	`_updateColumnNames = updateColumnNames;`
	`59`	`+ _updateColumnNames = _table?.FlattenProperties(_updateColumnNames) ?? _updateColumnNames;`
`53`	`60`	`return this;`
`54`	`61`	`}`
`55`	`62`
`56`	`63`	`public BulkMergeBuilder<T> WithUpdateColumns(Expression<Func<T, object>> updateColumnNamesSelector)`
`57`	`64`	`{`
`58`	`65`	`_updateColumnNames = updateColumnNamesSelector.Body.GetMemberNames().ToArray();`
	`66`	`+ _updateColumnNames = _table?.FlattenProperties(_updateColumnNames) ?? _updateColumnNames;`
`59`	`67`	`return this;`
`60`	`68`	`}`
`61`	`69`
`62`	`70`	`public BulkMergeBuilder<T> WithInsertColumns(IReadOnlyCollection<string> insertColumnNames)`
`63`	`71`	`{`
`64`	`72`	`_insertColumnNames = insertColumnNames;`
	`73`	`+ _insertColumnNames = _table?.FlattenProperties(_insertColumnNames) ?? _insertColumnNames;`
`65`	`74`	`return this;`
`66`	`75`	`}`
`67`	`76`
`68`	`77`	`public BulkMergeBuilder<T> WithInsertColumns(Expression<Func<T, object>> insertColumnNamesSelector)`
`69`	`78`	`{`
`70`	`79`	`_insertColumnNames = insertColumnNamesSelector.Body.GetMemberNames().ToArray();`
	`80`	`+ _insertColumnNames = _table?.FlattenProperties(_insertColumnNames) ?? _insertColumnNames;`
`71`	`81`	`return this;`
`72`	`82`	`}`
`73`	`83`
Original file line number	Diff line number	Diff line change
`@@ -26,31 +26,37 @@ public BulkUpdateBuilder(ConnectionContext connectionContext)`
`26`	`26`	`public BulkUpdateBuilder<T> ToTable(TableInfor<T> table)`
`27`	`27`	`{`
`28`	`28`	`_table = table;`
	`29`	`+ _updateKeys = _table?.FlattenProperties(_updateKeys) ?? _updateKeys;`
	`30`	`+ _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;`
`29`	`31`	`return this;`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public BulkUpdateBuilder<T> WithId(IReadOnlyCollection<string> idColumns)`
`33`	`35`	`{`
`34`	`36`	`_updateKeys = idColumns;`
	`37`	`+ _updateKeys = _table?.FlattenProperties(_updateKeys) ?? _updateKeys;`
`35`	`38`	`return this;`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`public BulkUpdateBuilder<T> WithId(Expression<Func<T, object>> idSelector)`
`39`	`42`	`{`
`40`	`43`	`var idColumn = idSelector.Body.GetMemberName();`
`41`	`44`	`_updateKeys = string.IsNullOrEmpty(idColumn) ? idSelector.Body.GetMemberNames() : new List<string> { idColumn };`
	`45`	`+ _updateKeys = _table?.FlattenProperties(_updateKeys) ?? _updateKeys;`
`42`	`46`	`return this;`
`43`	`47`	`}`
`44`	`48`
`45`	`49`	`public BulkUpdateBuilder<T> WithColumns(IReadOnlyCollection<string> columnNames)`
`46`	`50`	`{`
`47`	`51`	`_columnNames = columnNames;`
	`52`	`+ _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;`
`48`	`53`	`return this;`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`public BulkUpdateBuilder<T> WithColumns(Expression<Func<T, object>> columnNamesSelector)`
`52`	`57`	`{`
`53`	`58`	`_columnNames = columnNamesSelector.Body.GetMemberNames().ToArray();`
	`59`	`+ _columnNames = _table?.FlattenProperties(_columnNames) ?? _columnNames;`
`54`	`60`	`return this;`
`55`	`61`	`}`
`56`	`62`