Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ Nugets
EFCore.BulkExtensions.PerProvider/EFCore.BulkExtensions.MySql/*
EFCore.BulkExtensions.PerProvider/EFCore.BulkExtensions.PostgreSql/*
EFCore.BulkExtensions.PerProvider/EFCore.BulkExtensions.Sqlite/*
EFCore.BulkExtensions.PerProvider/EFCore.BulkExtensions.SqlServer/*
EFCore.BulkExtensions.PerProvider/EFCore.BulkExtensions.SqlServer/*
/EFCore.BulkExtensions/EFCore.BulkExtensions.csproj
/EFCore.BulkExtensions.MySql/EFCore.BulkExtensions.MySql.csproj
/EFCore.BulkExtensions.Core/EFCore.BulkExtensions.Core.csproj
22 changes: 0 additions & 22 deletions EFCore.BulkExtensions.Core/EFCore.BulkExtensions.Core.csproj

This file was deleted.

13 changes: 12 additions & 1 deletion EFCore.BulkExtensions.Core/TableInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -659,13 +659,24 @@ void AddOwnedType(INavigation navigationProperty, string prefix = "")
doAddProperty = false;
}

bool doAddPropertyOnUpdate = true;

if (doAddProperty && AreSpecifiedPropertiesToIncludeOnUpdate && !(BulkConfig.PropertiesToIncludeOnUpdate?.Contains(ownedPropertyFullName) ?? false))
doAddPropertyOnUpdate = false;
if (doAddProperty && AreSpecifiedPropertiesToExcludeOnUpdate && (BulkConfig.PropertiesToExcludeOnUpdate?.Contains(ownedPropertyFullName) ?? false))
doAddPropertyOnUpdate = false;

if (doAddProperty)
{
PropertyColumnNamesDict.Add(ownedPropertyFullName, columnName);
PropertyColumnNamesCompareDict.Add(ownedPropertyFullName, columnName);
PropertyColumnNamesUpdateDict.Add(ownedPropertyFullName, columnName);
OutputPropertyColumnNamesDict.Add(ownedPropertyFullName, columnName);
}

if (doAddProperty && doAddPropertyOnUpdate)
{
PropertyColumnNamesUpdateDict.Add(ownedPropertyFullName, columnName);
}
}
}
IEnumerable<INavigation>? ownedTypes;
Expand Down
14 changes: 0 additions & 14 deletions EFCore.BulkExtensions.MySql/EFCore.BulkExtensions.MySql.csproj

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ public static string MergeTable<T>(TableInfo tableInfo, OperationType operationT
var commaSeparatedColumns = SqlQueryBuilder.GetCommaSeparatedColumns(columnsList).Replace("[", "`").Replace("]", "`");
var columnsListEquals = GetColumnList(tableInfo, OperationType.InsertOrUpdate);
var columnsToUpdate = columnsListEquals.Where(c => tableInfo.PropertyColumnNamesDict.ContainsValue(c)).ToList();

if (operationType == OperationType.Update)
{
columnsToUpdate = columnsListEquals.Where(c => tableInfo.PropertyColumnNamesUpdateDict.ContainsValue(c)).ToList();
}

var equalsColumns = SqlQueryBuilder.GetCommaSeparatedColumns(columnsToUpdate, equalsTable: "EXCLUDED").Replace("[", "`").Replace("]", "`");

q = $"INSERT INTO {tableInfo.FullTableName} ({commaSeparatedColumns}) " +
Expand Down
18 changes: 0 additions & 18 deletions EFCore.BulkExtensions/EFCore.BulkExtensions.csproj

This file was deleted.