From 58a8ce99db02507b5c0d64bdb5e27c15d8a3d832 Mon Sep 17 00:00:00 2001 From: NorthernLight1 <49600465+NorthernLight1@users.noreply.github.com> Date: Fri, 27 Oct 2023 18:40:45 -0400 Subject: [PATCH 1/5] Added Support For Table-Per-Concrete Inheritance Added support for Table-Per-Concrete inheritance model Upgraded all EntityFrameworkCore packages to 7.0.13 Added test case 'With_Inheritance_Tpc' to Test\BulkInsert.cs Added test case 'With_Inheritance_Tpc' to Test\BulkInsertAsync.cs Added test case 'With_Inheritance_Tpc' to Test\BulkMerge.cs Added test case 'With_Inheritance_Tpc' to Test\BulkMergeAsync.cs Added test case 'With_Inheritance_Tpc' to Test\BulkUpdate.cs Added test case 'With_Inheritance_Tpc' to Test\BulkUpdateAsync.cs Renamed all test cases 'With_Default_Options_Tph' to 'With_Inheritance_Tph' --- .../Data/TestDbContext.cs | 7 +++- .../Data/TpcCustomer.cs | 11 ++++++ .../Data/TpcPerson.cs | 12 ++++++ .../Data/TpcVendor.cs | 10 +++++ .../DbContextExtensions/BulkInsert.cs | 39 ++++++++++++++++++- .../DbContextExtensions/BulkInsertAsync.cs | 39 ++++++++++++++++++- .../DbContextExtensions/BulkMerge.cs | 32 ++++++++++++++- .../DbContextExtensions/BulkMergeAsync.cs | 32 ++++++++++++++- .../DbContextExtensions/BulkUpdate.cs | 22 ++++++++++- .../DbContextExtensions/BulkUpdateAsync.cs | 22 ++++++++++- .../DbContextExtensionsBase.cs | 35 +++++++++++++++++ ...EntityFrameworkCore.Extensions.Test.csproj | 4 +- .../Data/DbContextExtensions.cs | 4 +- .../Data/TableMapping.cs | 2 + .../N.EntityFrameworkCore.Extensions.csproj | 8 ++-- README.md | 2 +- 16 files changed, 265 insertions(+), 16 deletions(-) create mode 100644 N.EntityFrameworkCore.Extensions.Test/Data/TpcCustomer.cs create mode 100644 N.EntityFrameworkCore.Extensions.Test/Data/TpcPerson.cs create mode 100644 N.EntityFrameworkCore.Extensions.Test/Data/TpcVendor.cs diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs index d8c2475..f1c3678 100644 --- a/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs @@ -2,6 +2,7 @@ using N.EntityFrameworkCore.Extensions.Test.Common; using System; using System.ComponentModel.DataAnnotations.Schema; +using System.Reflection.Metadata; using System.Runtime.ConstrainedExecution; namespace N.EntityFrameworkCore.Extensions.Test.Data @@ -11,6 +12,7 @@ public class TestDbContext : DbContext public virtual DbSet Products { get; set; } public virtual DbSet ProductsWithComplexKey { get; set; } public virtual DbSet Orders { get; set; } + public virtual DbSet TpcPeople { get; set; } public virtual DbSet TphPeople { get; set; } public virtual DbSet TphCustomers { get; set; } public virtual DbSet TphVendors { get; set; } @@ -22,12 +24,15 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) } protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity().Property("CreatedDate"); modelBuilder.Entity().HasKey(c => new { c.Key1 }); modelBuilder.Entity().Property("Key1").HasDefaultValueSql("newsequentialid()"); modelBuilder.Entity().Property("Key2").HasDefaultValueSql("newsequentialid()"); modelBuilder.Entity().Property("Key3").HasDefaultValueSql("newsequentialid()"); modelBuilder.Entity().Property("DbAddedDateTime").HasDefaultValueSql("getdate()"); + modelBuilder.Entity().UseTpcMappingStrategy(); + modelBuilder.Entity().ToTable("TpcCustomer"); + modelBuilder.Entity().ToTable("TpcVendor"); + modelBuilder.Entity().Property("CreatedDate"); } } } diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TpcCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TpcCustomer.cs new file mode 100644 index 0000000..e2d6593 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TpcCustomer.cs @@ -0,0 +1,11 @@ +using System; + +namespace N.EntityFrameworkCore.Extensions.Test.Data +{ + public class TpcCustomer : TpcPerson + { + public string Email { get; set; } + public string Phone { get; set; } + public DateTime AddedDate { get; set; } + } +} diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TpcPerson.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TpcPerson.cs new file mode 100644 index 0000000..9c8d9da --- /dev/null +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TpcPerson.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations.Schema; + +namespace N.EntityFrameworkCore.Extensions.Test.Data +{ + public abstract class TpcPerson + { + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public long Id { get; set; } + public string FirstName { get; set; } + public string LastName { get; set; } + } +} diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TpcVendor.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TpcVendor.cs new file mode 100644 index 0000000..f1df475 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TpcVendor.cs @@ -0,0 +1,10 @@ + +namespace N.EntityFrameworkCore.Extensions.Test.Data +{ + public class TpcVendor : TpcPerson + { + public string Email { get; set; } + public string Phone { get; set; } + public string Url { get; set; } + } +} \ No newline at end of file diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs index de6effb..d2d13f1 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs @@ -61,7 +61,44 @@ public void With_Default_Options() Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted."); } [TestMethod] - public void With_Default_Options_Tph() + public void With_Inheritance_Tpc() + { + var dbContext = SetupDbContext(false); + var customers = new List(); + var vendors = new List(); + for (int i = 0; i < 20000; i++) + { + customers.Add(new TpcCustomer + { + Id = i, + FirstName = string.Format("John_{0}", i), + LastName = string.Format("Smith_{0}", i), + Email = string.Format("john.smith{0}@domain.com", i), + AddedDate = DateTime.UtcNow + }); + } + for (int i = 20000; i < 30000; i++) + { + vendors.Add(new TpcVendor + { + Id = i, + FirstName = string.Format("Mike_{0}", i), + LastName = string.Format("Smith_{0}", i), + Email = string.Format("mike.smith{0}@domain.com", i), + Url = string.Format("http://domain.com/mike.smith{0}", i) + }); + } + int oldTotal = dbContext.TpcPeople.Count(); + int customerRowsInserted = dbContext.BulkInsert(customers); + int vendorRowsInserted = dbContext.BulkInsert(vendors); + int rowsInserted = customerRowsInserted + vendorRowsInserted; + int newTotal = dbContext.TpcPeople.Count(); + + Assert.IsTrue(rowsInserted == customers.Count + vendors.Count, "The number of rows inserted must match the count of order list"); + Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted."); + } + [TestMethod] + public void With_Inheritance_Tph() { var dbContext = SetupDbContext(false); var customers = new List(); diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsertAsync.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsertAsync.cs index 8ffcb8e..d846e13 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsertAsync.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsertAsync.cs @@ -45,7 +45,44 @@ public async Task With_Default_Options() Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted."); } [TestMethod] - public async Task With_Default_Options_Tph() + public async Task With_Inheritance_Tpc() + { + var dbContext = SetupDbContext(false); + var customers = new List(); + var vendors = new List(); + for (int i = 0; i < 20000; i++) + { + customers.Add(new TpcCustomer + { + Id = i, + FirstName = string.Format("John_{0}", i), + LastName = string.Format("Smith_{0}", i), + Email = string.Format("john.smith{0}@domain.com", i), + AddedDate = DateTime.UtcNow + }); + } + for (int i = 20000; i < 30000; i++) + { + vendors.Add(new TpcVendor + { + Id = i, + FirstName = string.Format("Mike_{0}", i), + LastName = string.Format("Smith_{0}", i), + Email = string.Format("mike.smith{0}@domain.com", i), + Url = string.Format("http://domain.com/mike.smith{0}", i) + }); + } + int oldTotal = dbContext.TpcPeople.Count(); + int customerRowsInserted = await dbContext.BulkInsertAsync(customers); + int vendorRowsInserted = await dbContext.BulkInsertAsync(vendors); + int rowsInserted = customerRowsInserted + vendorRowsInserted; + int newTotal = dbContext.TpcPeople.Count(); + + Assert.IsTrue(rowsInserted == customers.Count + vendors.Count, "The number of rows inserted must match the count of order list"); + Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted."); + } + [TestMethod] + public async Task With_Inheritance_Tph() { var dbContext = SetupDbContext(false); var customers = new List(); diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMerge.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMerge.cs index 921c132..13bc9d4 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMerge.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMerge.cs @@ -52,7 +52,37 @@ public void With_Default_Options() Assert.IsTrue(areUpdatedOrdersMerged, "The orders that were updated did not merge correctly"); } [TestMethod] - public void With_Default_Options_Tph() + public void With_Inheritance_Tpc() + { + var dbContext = SetupDbContext(true); + var customers = dbContext.TpcPeople.Where(o => o.Id <= 1000).OfType().ToList(); + int customersToAdd = 5000; + int customersToUpdate = customers.Count; + foreach (var customer in customers) + { + customer.FirstName = "BulkMerge_Tpc_Update"; + } + for (int i = 0; i < customersToAdd; i++) + { + customers.Add(new TpcCustomer + { + Id = 10000 + i, + FirstName = "BulkMerge_Tpc_Add", + AddedDate = DateTime.UtcNow + }); + } + var result = dbContext.BulkMerge(customers, options => { options.MergeOnCondition = (s, t) => s.Id == t.Id; }); + int customersAdded = dbContext.TpcPeople.Where(o => o.FirstName == "BulkMerge_Tpc_Add").OfType().Count(); + int customersUpdated = dbContext.TpcPeople.Where(o => o.FirstName == "BulkMerge_Tpc_Update").OfType().Count(); + + Assert.IsTrue(result.RowsAffected == customers.Count, "The number of rows inserted must match the count of customer list"); + Assert.IsTrue(result.RowsUpdated == customersToUpdate, "The number of rows updated must match"); + Assert.IsTrue(result.RowsInserted == customersToAdd, "The number of rows added must match"); + Assert.IsTrue(customersToAdd == customersAdded, "The custmoers that were added did not merge correctly"); + Assert.IsTrue(customersToUpdate == customersUpdated, "The customers that were updated did not merge correctly"); + } + [TestMethod] + public void With_Inheritance_Tph() { var dbContext = SetupDbContext(true); var customers = dbContext.TphPeople.Where(o => o.Id <= 1000).OfType().ToList(); diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMergeAsync.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMergeAsync.cs index afb728a..40a4484 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMergeAsync.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMergeAsync.cs @@ -53,7 +53,37 @@ public async Task With_Default_Options() Assert.IsTrue(areUpdatedOrdersMerged, "The orders that were updated did not merge correctly"); } [TestMethod] - public async Task With_Default_Options_Tph() + public async Task With_Inheritance_Tpc() + { + var dbContext = SetupDbContext(true); + var customers = dbContext.TpcPeople.Where(o => o.Id <= 1000).OfType().ToList(); + int customersToAdd = 5000; + int customersToUpdate = customers.Count; + foreach (var customer in customers) + { + customer.FirstName = "BulkMerge_Tpc_Update"; + } + for (int i = 0; i < customersToAdd; i++) + { + customers.Add(new TpcCustomer + { + Id = 10000 + i, + FirstName = "BulkMerge_Tpc_Add", + AddedDate = DateTime.UtcNow + }); + } + var result = await dbContext.BulkMergeAsync(customers, options => { options.MergeOnCondition = (s, t) => s.Id == t.Id; }); + int customersAdded = dbContext.TpcPeople.Where(o => o.FirstName == "BulkMerge_Tpc_Add").OfType().Count(); + int customersUpdated = dbContext.TpcPeople.Where(o => o.FirstName == "BulkMerge_Tpc_Update").OfType().Count(); + + Assert.IsTrue(result.RowsAffected == customers.Count, "The number of rows inserted must match the count of customer list"); + Assert.IsTrue(result.RowsUpdated == customersToUpdate, "The number of rows updated must match"); + Assert.IsTrue(result.RowsInserted == customersToAdd, "The number of rows added must match"); + Assert.IsTrue(customersToAdd == customersAdded, "The custmoers that were added did not merge correctly"); + Assert.IsTrue(customersToUpdate == customersUpdated, "The customers that were updated did not merge correctly"); + } + [TestMethod] + public async Task With_Inheritance_Tph() { var dbContext = SetupDbContext(true); var customers = dbContext.TphPeople.Where(o => o.Id <= 1000).OfType().ToList(); diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdate.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdate.cs index 8a55d76..d29d3dd 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdate.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdate.cs @@ -47,7 +47,27 @@ public void With_Default_Options() Assert.IsTrue(newOrders == rowsUpdated, "The count of new orders must be equal the number of rows updated in the database."); } [TestMethod] - public void With_Default_Options_Tph() + public void With_Inheritance_Tpc() + { + var dbContext = SetupDbContext(true, PopulateDataMode.Tpc); + var customers = dbContext.TpcPeople.Where(o => o.LastName != "BulkUpdate_Tpc").OfType().ToList(); + var vendors = dbContext.TpcPeople.OfType().ToList(); + foreach (var customer in customers) + { + customer.FirstName = string.Format("Id={0}", customer.Id); + customer.LastName = "BulkUpdate_Tpc"; + } + int rowsUpdated = dbContext.BulkUpdate(customers); + var newCustomers = dbContext.TpcPeople.Where(o => o.LastName == "BulkUpdate_Tpc").OfType().Count(); + int entitiesWithChanges = dbContext.ChangeTracker.Entries().Where(t => t.State == EntityState.Modified).Count(); + + Assert.IsTrue(vendors.Count > 0 && vendors.Count != customers.Count, "There should be vendor records in the database"); + Assert.IsTrue(customers.Count > 0, "There must be customers in database that match this condition (Price = $1.25)"); + Assert.IsTrue(rowsUpdated == customers.Count, "The number of rows updated must match the count of entities that were retrieved"); + Assert.IsTrue(newCustomers == rowsUpdated, "The count of new customers must be equal the number of rows updated in the database."); + } + [TestMethod] + public void With_Inheritance_Tph() { var dbContext = SetupDbContext(true, PopulateDataMode.Tph); var customers = dbContext.TphPeople.Where(o => o.LastName != "BulkUpdateTest").OfType().ToList(); diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdateAsync.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdateAsync.cs index d49955a..222093c 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdateAsync.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkUpdateAsync.cs @@ -48,7 +48,27 @@ public async Task With_Default_Options() Assert.IsTrue(newOrders == rowsUpdated, "The count of new orders must be equal the number of rows updated in the database."); } [TestMethod] - public async Task With_Default_Options_Tph() + public async Task With_Inheritance_Tpc() + { + var dbContext = SetupDbContext(true, PopulateDataMode.Tpc); + var customers = dbContext.TpcPeople.Where(o => o.LastName != "BulkUpdateTest").OfType().ToList(); + var vendors = dbContext.TpcPeople.OfType().ToList(); + foreach (var customer in customers) + { + customer.FirstName = string.Format("Id={0}", customer.Id); + customer.LastName = "BulkUpdate_Tpc"; + } + int rowsUpdated = await dbContext.BulkUpdateAsync(customers, options => { options.UpdateOnCondition = (s, t) => s.Id == t.Id; }); + var newCustomers = dbContext.TpcPeople.Where(o => o.LastName == "BulkUpdate_Tpc").OfType().Count(); + int entitiesWithChanges = dbContext.ChangeTracker.Entries().Where(t => t.State == EntityState.Modified).Count(); + + Assert.IsTrue(vendors.Count > 0 && vendors.Count != customers.Count, "There should be vendor records in the database"); + Assert.IsTrue(customers.Count > 0, "There must be customers in database that match this condition (Price = $1.25)"); + Assert.IsTrue(rowsUpdated == customers.Count, "The number of rows updated must match the count of entities that were retrieved"); + Assert.IsTrue(newCustomers == rowsUpdated, "The count of new customers must be equal the number of rows updated in the database."); + } + [TestMethod] + public async Task With_Inheritance_Tph() { var dbContext = SetupDbContext(true, PopulateDataMode.Tph); var customers = dbContext.TphPeople.Where(o => o.LastName != "BulkUpdateTest").OfType().ToList(); diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs index 493d720..4e877a2 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs @@ -10,6 +10,7 @@ namespace N.EntityFrameworkCore.Extensions.Test.DbContextExtensions public enum PopulateDataMode { Normal, + Tpc, Tph } [TestClass] @@ -26,6 +27,8 @@ protected TestDbContext SetupDbContext(bool populateData, PopulateDataMode mode TestDbContext dbContext = new TestDbContext(); dbContext.Orders.Truncate(); dbContext.Products.Truncate(); + dbContext.Database.ClearTable("TpcCustomer"); + dbContext.Database.ClearTable("TpcVendor"); dbContext.Database.ClearTable("TphPeople"); dbContext.Database.DropTable("OrdersUnderTen", true); dbContext.Database.DropTable("OrdersLast30Days", true); @@ -132,6 +135,38 @@ protected TestDbContext SetupDbContext(bool populateData, PopulateDataMode mode dbContext.BulkInsert(tphCustomers, new BulkInsertOptions() { KeepIdentity = true }); dbContext.BulkInsert(tphVendors, new BulkInsertOptions() { KeepIdentity = true }); } + else if (mode == PopulateDataMode.Tpc) + { + //TPC Customers & Vendors + var tpcCustomers = new List(); + var tpcVendors = new List(); + for (int i = 0; i < 2000; i++) + { + tpcCustomers.Add(new TpcCustomer + { + Id = i, + FirstName = string.Format("John_{0}", i), + LastName = string.Format("Smith_{0}", i), + Email = string.Format("john.smith{0}@domain.com", i), + Phone = "404-555-1111", + AddedDate = DateTime.UtcNow + }); + } + for (int i = 2000; i < 3000; i++) + { + tpcVendors.Add(new TpcVendor + { + Id = i, + FirstName = string.Format("Mike_{0}", i), + LastName = string.Format("Smith_{0}", i), + Phone = "404-555-2222", + Email = string.Format("mike.smith{0}@domain.com", i), + Url = string.Format("http://domain.com/mike.smith{0}", i) + }); + } + dbContext.BulkInsert(tpcCustomers, new BulkInsertOptions() { KeepIdentity = true }); + dbContext.BulkInsert(tpcVendors, new BulkInsertOptions() { KeepIdentity = true }); + } } return dbContext; } diff --git a/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.Test.csproj b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.Test.csproj index cc694ff..3d3d89a 100644 --- a/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.Test.csproj +++ b/N.EntityFrameworkCore.Extensions.Test/N.EntityFrameworkCore.Extensions.Test.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs b/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs index 9512536..8499ca1 100644 --- a/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs +++ b/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs @@ -284,10 +284,10 @@ public static int BulkInsert(this DbContext context, IEnumerable entities, SqlUtil.ConvertToColumnString(columnsToInsert), columnsToOutput.Count > 0 ? " OUTPUT " + SqlUtil.ConvertToColumnString(columnsToOutput) : ""); - if (options.KeepIdentity && primaryKeyColumnNames.Length > 0) + if (options.KeepIdentity && tableMapping.HasIdentityColumn) context.Database.ToggleIdentityInsert(true, destinationTableName); var bulkQueryResult = context.BulkQuery(insertSqlText, dbConnection, transaction, options); - if (options.KeepIdentity && primaryKeyColumnNames.Length > 0) + if (options.KeepIdentity && tableMapping.HasIdentityColumn) context.Database.ToggleIdentityInsert(false, destinationTableName); rowsAffected = bulkQueryResult.RowsAffected; diff --git a/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs b/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs index 7057ca4..5d13c6b 100644 --- a/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs +++ b/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs @@ -14,6 +14,8 @@ public class TableMapping public IProperty[] Properties { get; } public string Schema { get; } public string TableName { get; } + + public bool HasIdentityColumn => EntityType.FindPrimaryKey().Properties.Any(o => o.ValueGenerated != ValueGenerated.Never); public StoreObjectIdentifier StoreObjectIdentifier => StoreObjectIdentifier.Table(TableName, EntityType.GetSchema()); public string FullQualifedTableName { diff --git a/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj b/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj index 5c5f18b..f8b03ea 100644 --- a/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj +++ b/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj @@ -2,7 +2,7 @@ net6.0 - 6.0.8.6 + 7.0.13.0 true https://github.com/NorthernLight1/N.EntityFrameworkCore.Extensions/ Northern25 @@ -19,9 +19,9 @@ Inheritance models supported: Table-Per-Hierarchy - - - + + + \ No newline at end of file diff --git a/README.md b/README.md index bf4c8c5..70dec5e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The framework currently supports the following operations: Entity Framework Extensions extends your DbContext with high-performance bulk operations: BulkDelete, BulkFetch, BulkInsert, BulkMerge, BulkSaveChanges, BulkSync, BulkUpdate, Fetch, FromSqlQuery, DeleteFromQuery, InsertFromQuery, UpdateFromQuery, QueryToCsvFile, SqlQueryToCsvFile -Supports: Transaction, Asynchronous Execution, Inheritance Models (Table-Per-Hierarchy) +Supports: Transaction, Asynchronous Execution, Inheritance Models (Table-Per-Concrete, Table-Per-Hierarchy) ### Installation From ff81efe90cb33a598106ce0dfa271842c423adaa Mon Sep 17 00:00:00 2001 From: NorthernLight1 <49600465+NorthernLight1@users.noreply.github.com> Date: Fri, 27 Oct 2023 18:43:41 -0400 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70dec5e..8af3a98 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ N.EntityFrameworkCore.Extensions [![latest version](https://img.shields.io/nuget/v/N.EntityFrameworkCore.Extensions)](https://www.nuget.org/packages/N.EntityFrameworkCore.Extensions) [![downloads](https://img.shields.io/nuget/dt/N.EntityFrameworkCore.Extensions)](https://www.nuget.org/packages/N.EntityFrameworkCore.Extensions) -## Bulk data support data support for EntityFrameworkCore v6.0.8+ +## Bulk data support data support for EntityFrameworkCore v7.0.13+ The framework currently supports the following operations: From e7f438d79bc53734fe4cabd1eb49757ca73146fb Mon Sep 17 00:00:00 2001 From: NorthernLight1 <49600465+NorthernLight1@users.noreply.github.com> Date: Sun, 29 Oct 2023 00:05:06 -0400 Subject: [PATCH 3/5] Added Support For Table-Per-Type To BulkInsert() --- .../Data/SqlExpression.cs | 80 +++++++++++++++++++ .../Data/TestDbContext.cs | 6 ++ .../Data/TptCustomer.cs | 11 +++ .../Data/TptPerson.cs | 12 +++ .../Data/TptVendor.cs | 10 +++ .../DbContextExtensions/BulkInsert.cs | 42 +++++++++- .../DbContextExtensionsBase.cs | 3 + .../Data/DatabaseFacadeExtensions.cs | 6 +- .../Data/DbContextExtensions.cs | 78 +++++++++--------- .../Data/TableMapping.cs | 33 +++++++- .../Sql/SqlExpression.cs | 80 +++++++++++++++++++ .../Sql/SqlExpressionType.cs | 9 +++ .../Sql/SqlKeyword.cs | 29 +++++++ .../Sql/SqlPart.cs | 33 ++++++++ .../Sql/SqlStatement.cs | 78 ++++++++++++++++++ 15 files changed, 466 insertions(+), 44 deletions(-) create mode 100644 N.EntityFrameworkCore.Extensions.Test/Data/SqlExpression.cs create mode 100644 N.EntityFrameworkCore.Extensions.Test/Data/TptCustomer.cs create mode 100644 N.EntityFrameworkCore.Extensions.Test/Data/TptPerson.cs create mode 100644 N.EntityFrameworkCore.Extensions.Test/Data/TptVendor.cs create mode 100644 N.EntityFrameworkCore.Extensions/Sql/SqlExpression.cs create mode 100644 N.EntityFrameworkCore.Extensions/Sql/SqlExpressionType.cs create mode 100644 N.EntityFrameworkCore.Extensions/Sql/SqlKeyword.cs create mode 100644 N.EntityFrameworkCore.Extensions/Sql/SqlPart.cs create mode 100644 N.EntityFrameworkCore.Extensions/Sql/SqlStatement.cs diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/SqlExpression.cs b/N.EntityFrameworkCore.Extensions.Test/Data/SqlExpression.cs new file mode 100644 index 0000000..bcaa187 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions.Test/Data/SqlExpression.cs @@ -0,0 +1,80 @@ +using Microsoft.EntityFrameworkCore.Metadata.Internal; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Runtime.InteropServices.ObjectiveC; +using System.Text; +using System.Threading.Tasks; + +namespace N.EntityFrameworkCore.Extensions.Sql +{ + internal class SqlExpression + { + SqlExpressionType ExpressionType { get; } + List Items { get; set; } + string Sql => ToSql(); + string Alias { get; } + bool IsEmpty => Items.Count == 0; + + internal SqlExpression(SqlExpressionType expressionType, object item, string alias = null) + { + ExpressionType = expressionType; + Items = new List(); + if (item is IEnumerable values) + { + Items.AddRange(values.ToArray()); + } + else + { + Items.Add(item); + } + Alias = alias; + } + internal SqlExpression(SqlExpressionType expressionType, object[] items, string alias = null) + { + ExpressionType = expressionType; + Items = new List(); + Items.AddRange(items); + Alias = alias; + } + internal static SqlExpression Columns(IEnumerable columns) + { + return new SqlExpression(SqlExpressionType.Columns, columns); + } + + internal static SqlExpression String(string joinOnCondition) + { + return new SqlExpression(SqlExpressionType.String, joinOnCondition); + } + + internal static SqlExpression Table(string tableName, string alias = null) + { + return new SqlExpression(SqlExpressionType.Table, tableName, alias); + } + + private string ToSql() + { + var values = Items.Select(o => o.ToString()).ToArray(); + StringBuilder sbSql = new StringBuilder(); + if (ExpressionType == SqlExpressionType.Columns) + { + sbSql.Append(string.Join(",", values.Select(c => c.StartsWith("$") || c.StartsWith("[") ? c : $"[{c}]"))); + } + else + { + sbSql.Append(string.Join(",", Items.Select(o => o.ToString()))); + } + if (Alias != null) + { + sbSql.Append(" "); + sbSql.Append(SqlKeyword.As.ToString().ToUpper()); + sbSql.Append(" "); + sbSql.Append(Alias); + } + //var test = Items.Select(o => o.ToString()).ToArray(); + return sbSql.ToString(); + } + } +} diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs index f1c3678..0578c51 100644 --- a/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs @@ -16,6 +16,9 @@ public class TestDbContext : DbContext public virtual DbSet TphPeople { get; set; } public virtual DbSet TphCustomers { get; set; } public virtual DbSet TphVendors { get; set; } + public virtual DbSet TptPeople { get; set; } + public virtual DbSet TptCustomers { get; set; } + public virtual DbSet TptVendors { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { @@ -33,6 +36,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) modelBuilder.Entity().ToTable("TpcCustomer"); modelBuilder.Entity().ToTable("TpcVendor"); modelBuilder.Entity().Property("CreatedDate"); + modelBuilder.Entity().ToTable("TptPeople"); + modelBuilder.Entity().ToTable("TptCustomer"); + modelBuilder.Entity().ToTable("TptVendor"); } } } diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TptCustomer.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TptCustomer.cs new file mode 100644 index 0000000..e9fe899 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TptCustomer.cs @@ -0,0 +1,11 @@ +using System; + +namespace N.EntityFrameworkCore.Extensions.Test.Data +{ + public class TptCustomer : TptPerson + { + public string Email { get; set; } + public string Phone { get; set; } + public DateTime AddedDate { get; set; } + } +} diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TptPerson.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TptPerson.cs new file mode 100644 index 0000000..9dedb6f --- /dev/null +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TptPerson.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations.Schema; + +namespace N.EntityFrameworkCore.Extensions.Test.Data +{ + public class TptPerson + { + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public long Id { get; set; } + public string FirstName { get; set; } + public string LastName { get; set; } + } +} diff --git a/N.EntityFrameworkCore.Extensions.Test/Data/TptVendor.cs b/N.EntityFrameworkCore.Extensions.Test/Data/TptVendor.cs new file mode 100644 index 0000000..1098cf9 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions.Test/Data/TptVendor.cs @@ -0,0 +1,10 @@ + +namespace N.EntityFrameworkCore.Extensions.Test.Data +{ + public class TptVendor : TptPerson + { + public string Email { get; set; } + public string Phone { get; set; } + public string Url { get; set; } + } +} \ No newline at end of file diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs index d2d13f1..69a4686 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs @@ -89,8 +89,8 @@ public void With_Inheritance_Tpc() }); } int oldTotal = dbContext.TpcPeople.Count(); - int customerRowsInserted = dbContext.BulkInsert(customers); - int vendorRowsInserted = dbContext.BulkInsert(vendors); + int customerRowsInserted = dbContext.BulkInsert(customers, o => o.UsePermanentTable = true); + int vendorRowsInserted = dbContext.BulkInsert(vendors, o => o.UsePermanentTable = true); int rowsInserted = customerRowsInserted + vendorRowsInserted; int newTotal = dbContext.TpcPeople.Count(); @@ -137,6 +137,44 @@ public void With_Inheritance_Tph() Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted."); } [TestMethod] + public void With_Inheritance_Tpt() + { + var dbContext = SetupDbContext(false); + var customers = new List(); + var vendors = new List(); + for (int i = 0; i < 20000; i++) + { + customers.Add(new TptCustomer + { + Id = i, + FirstName = string.Format("John_{0}", i), + LastName = string.Format("Smith_{0}", i), + Email = string.Format("john.smith{0}@domain.com", i), + Phone = "777-555-1234", + AddedDate = DateTime.UtcNow + }); + } + for (int i = 20000; i < 30000; i++) + { + vendors.Add(new TptVendor + { + Id = i, + FirstName = string.Format("Mike_{0}", i), + LastName = string.Format("Smith_{0}", i), + Email = string.Format("mike.smith{0}@domain.com", i), + Url = string.Format("http://domain.com/mike.smith{0}", i) + }); + } + int oldTotal = dbContext.TptPeople.Count(); + int customerRowsInserted = dbContext.BulkInsert(customers, o => o.UsePermanentTable = true); + int vendorRowsInserted = dbContext.BulkInsert(vendors); + int rowsInserted = customerRowsInserted + vendorRowsInserted; + int newTotal = dbContext.TptPeople.Count(); + + Assert.IsTrue(rowsInserted == customers.Count + vendors.Count, "The number of rows inserted must match the count of order list"); + Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted."); + } + [TestMethod] public void Without_Identity_Column() { var dbContext = SetupDbContext(true); diff --git a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs index 4e877a2..5670c39 100644 --- a/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs +++ b/N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/DbContextExtensionsBase.cs @@ -30,6 +30,9 @@ protected TestDbContext SetupDbContext(bool populateData, PopulateDataMode mode dbContext.Database.ClearTable("TpcCustomer"); dbContext.Database.ClearTable("TpcVendor"); dbContext.Database.ClearTable("TphPeople"); + dbContext.Database.ClearTable("TptPeople"); + dbContext.Database.ClearTable("TptCustomer"); + dbContext.Database.ClearTable("TptVendor"); dbContext.Database.DropTable("OrdersUnderTen", true); dbContext.Database.DropTable("OrdersLast30Days", true); if (populateData) diff --git a/N.EntityFrameworkCore.Extensions/Data/DatabaseFacadeExtensions.cs b/N.EntityFrameworkCore.Extensions/Data/DatabaseFacadeExtensions.cs index 9703d9e..15163ed 100644 --- a/N.EntityFrameworkCore.Extensions/Data/DatabaseFacadeExtensions.cs +++ b/N.EntityFrameworkCore.Extensions/Data/DatabaseFacadeExtensions.cs @@ -25,10 +25,14 @@ public static int ClearTable(this DatabaseFacade database, string tableName) return database.ExecuteSqlRaw(string.Format("DELETE FROM {0}", tableName)); } internal static int CloneTable(this DatabaseFacade database, string sourceTable, string destinationTable, IEnumerable columnNames, string internalIdColumnName = null) + { + return database.CloneTable(new string[] { sourceTable }, destinationTable, columnNames, internalIdColumnName); + } + internal static int CloneTable(this DatabaseFacade database, IEnumerable sourceTables, string destinationTable, IEnumerable columnNames, string internalIdColumnName = null) { string columns = columnNames != null && columnNames.Count() > 0 ? string.Join(",", CommonUtil.FormatColumns(columnNames)) : "*"; columns = !string.IsNullOrEmpty(internalIdColumnName) ? string.Format("{0},CAST( NULL AS INT) AS {1}", columns, internalIdColumnName) : columns; - return database.ExecuteSqlRaw(string.Format("SELECT TOP 0 {0} INTO {1} FROM {2}", columns, destinationTable, sourceTable)); + return database.ExecuteSqlRaw(string.Format("SELECT TOP 0 {0} INTO {1} FROM {2}", columns, destinationTable, string.Join(",",sourceTables))); } internal static DbCommand CreateCommand(this DatabaseFacade database, ConnectionBehavior connectionBehavior = ConnectionBehavior.Default) { diff --git a/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs b/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs index 8499ca1..4bb19c0 100644 --- a/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs +++ b/N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs @@ -253,66 +253,67 @@ public static int BulkInsert(this DbContext context, IEnumerable entities, var dbConnection = dbTransactionContext.Connection; var transaction = dbTransactionContext.CurrentTransaction; string stagingTableName = CommonUtil.GetStagingTableName(tableMapping, options.UsePermanentTable, dbConnection); - string destinationTableName = string.Format("[{0}].[{1}]", tableMapping.Schema, tableMapping.TableName); + //string destinationTableName = string.Format("[{0}].[{1}]", tableMapping.Schema, tableMapping.TableName); string[] primaryKeyColumnNames = tableMapping.GetPrimaryKeyColumns().ToArray(); IEnumerable columnNames = CommonUtil.FilterColumns(tableMapping.GetColumns(options.KeepIdentity), primaryKeyColumnNames, options.InputColumns, options.IgnoreColumns); - IEnumerable autoGeneratedColumnNames = options.AutoMapOutput ? tableMapping.GetAutoGeneratedColumns() : new string[] { }; - IEnumerable columnsToInsert = CommonUtil.FormatColumns(columnNames); + if (options.InsertIfNotExists) { columnNames = columnNames.Union(primaryKeyColumnNames); } - - context.Database.CloneTable(destinationTableName, stagingTableName, columnNames, Common.Constants.InternalId_ColumnName); + + context.Database.CloneTable(tableMapping.GetSchemaQualifiedTableNames(), stagingTableName, tableMapping.GetQualifiedColumnNames(columnNames), Common.Constants.InternalId_ColumnName); var bulkInsertResult = BulkInsert(entities, options, tableMapping, dbConnection, transaction, stagingTableName, columnNames, SqlBulkCopyOptions.KeepIdentity, true); - List columnsToOutput = new List { "$Action", string.Format("[{0}].[{1}]", "s", Constants.InternalId_ColumnName) }; - var entityProperties = new List(); - var entityType = tableMapping.EntityType; - - foreach (var autoGeneratedColumnName in autoGeneratedColumnNames) + foreach(var entityType in tableMapping.EntityTypes) { - columnsToOutput.Add(string.Format("[inserted].[{0}]", autoGeneratedColumnName)); - entityProperties.Add(entityType.GetProperty(autoGeneratedColumnName)); - } + var columnsToInsert = tableMapping.GetColumnNames(entityType).Intersect(columnNames); + List columnsToOutput = new List(); + var entityProperties = new List(); + if (options.AutoMapOutput) + { + columnsToOutput.AddRange(new List() { "$Action", string.Format("[{0}].[{1}]", "s", Constants.InternalId_ColumnName) }); + var autoGeneratedColumnNames = tableMapping.GetAutoGeneratedColumns(entityType); + foreach (var autoGeneratedColumnName in autoGeneratedColumnNames) + { + columnsToOutput.Add(string.Format("[inserted].[{0}]", autoGeneratedColumnName)); + entityProperties.Add(tableMapping.EntityType.GetProperty(autoGeneratedColumnName)); + } + } - string insertSqlText = string.Format("MERGE {0} t USING {1} s ON {2} WHEN NOT MATCHED THEN INSERT ({3}) VALUES ({3}){4};", - destinationTableName, - stagingTableName, - options.InsertIfNotExists ? CommonUtil.GetJoinConditionSql(options.InsertOnCondition, primaryKeyColumnNames, "t", "s") : "1=2", - SqlUtil.ConvertToColumnString(columnsToInsert), - columnsToOutput.Count > 0 ? " OUTPUT " + SqlUtil.ConvertToColumnString(columnsToOutput) : ""); + bool toggleIdentityInsert = options.KeepIdentity && tableMapping.HasIdentityColumn; + string joinOnCondition = options.InsertIfNotExists ? CommonUtil.GetJoinConditionSql(options.InsertOnCondition, primaryKeyColumnNames, "t", "s") : "1=2"; + var mergeStatement = SqlStatement.CreateMergeInsert(stagingTableName, entityType.GetTableName(), joinOnCondition, columnsToInsert, columnsToOutput); - if (options.KeepIdentity && tableMapping.HasIdentityColumn) - context.Database.ToggleIdentityInsert(true, destinationTableName); - var bulkQueryResult = context.BulkQuery(insertSqlText, dbConnection, transaction, options); - if (options.KeepIdentity && tableMapping.HasIdentityColumn) - context.Database.ToggleIdentityInsert(false, destinationTableName); - rowsAffected = bulkQueryResult.RowsAffected; - - if (options.AutoMapOutput) - { - if (rowsAffected == entities.Count()) + if (options.AutoMapOutput) { - foreach (var result in bulkQueryResult.Results) + var bulkQueryResult = context.BulkQuery(mergeStatement.Sql, dbConnection, transaction, options); + //Should this be the sum of all tables + rowsAffected = bulkQueryResult.RowsAffected; + if (rowsAffected == entities.Count()) { - int entityId = (int)result[1]; - var entity = bulkInsertResult.EntityMap[entityId]; - var entityValues = result.Skip(2).ToArray(); - context.SetStoreGeneratedValues(entity, entityProperties, entityValues); + foreach (var result in bulkQueryResult.Results) + { + int entityId = (int)result[1]; + var entity = bulkInsertResult.EntityMap[entityId]; + var entityValues = result.Skip(2).ToArray(); + context.SetStoreGeneratedValues(entity, entityProperties, entityValues); + } } } + else + { + rowsAffected = context.Database.ExecuteSql(mergeStatement.Sql, options.CommandTimeout); + } } - context.Database.DropTable(stagingTableName); - //ClearEntityStateToUnchanged(context, entities); dbTransactionContext.Commit(); return rowsAffected; } - catch (Exception ex) + catch (Exception) { dbTransactionContext.Rollback(); throw; @@ -370,7 +371,8 @@ private static BulkInsertResult BulkInsert(IEnumerable entities, BulkOp } foreach (var property in dataReader.TableMapping.Properties) { - var columnName = property.GetColumnName(dataReader.TableMapping.StoreObjectIdentifier); + var columnName = property.GetColumnName(); + //var columnName = property.GetColumnName(dataReader.TableMapping.StoreObjectIdentifier); if (inputColumns == null || (inputColumns != null && inputColumns.Contains(columnName))) sqlBulkCopy.ColumnMappings.Add(property.Name, columnName); } diff --git a/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs b/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs index 5d13c6b..24edbba 100644 --- a/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs +++ b/N.EntityFrameworkCore.Extensions/Data/TableMapping.cs @@ -14,6 +14,7 @@ public class TableMapping public IProperty[] Properties { get; } public string Schema { get; } public string TableName { get; } + public IEnumerable EntityTypes { get; } public bool HasIdentityColumn => EntityType.FindPrimaryKey().Properties.Any(o => o.ValueGenerated != ValueGenerated.Never); public StoreObjectIdentifier StoreObjectIdentifier => StoreObjectIdentifier.Table(TableName, EntityType.GetSchema()); @@ -29,13 +30,32 @@ public TableMapping(DbContext dbContext, IEntityType entityType) Properties = entityType.GetProperties().ToArray(); Schema = entityType.GetSchema() ?? "dbo"; TableName = entityType.GetTableName(); + EntityTypes = EntityType.GetAllBaseTypesInclusive().Where(o => !o.IsAbstract()); var options = dbContext.GetPrivateFieldValue("_options") as DbContextOptions; } + public IEnumerable GetQualifiedColumnNames(IEnumerable columnNames, IEntityType entityType = null) + { + return EntityType.GetProperties().Where(o => (entityType == null || o.DeclaringEntityType == entityType) + && columnNames == null || columnNames.Contains(o.GetColumnName())) + .Select(o => string.Format("[{0}].[{1}]", FindTableName(o.DeclaringEntityType, EntityType), o.GetColumnName())); + } + + private string FindTableName(IEntityType declaringEntityType, IEntityType entityType) + { + return !declaringEntityType.IsAbstract() ? declaringEntityType.GetTableName() : entityType.GetTableName(); + } + + public IEnumerable GetColumnNames(IEntityType entityType) + { + return entityType.GetProperties().Where(o => (o.DeclaringEntityType == entityType || o.DeclaringEntityType.IsAbstract() + || o.IsForeignKeyToSelf()) && o.ValueGenerated == ValueGenerated.Never) + .Select(o => o.GetColumnName()); + } public IEnumerable GetColumns(bool includePrimaryKeyColumns=false) { var columns = EntityType.GetProperties().Where(o => o.ValueGenerated == ValueGenerated.Never) - .Select(o => o.GetColumnName(this.StoreObjectIdentifier)); + .Select(o => o.GetColumnName()); if(includePrimaryKeyColumns) { columns = columns.Union(GetPrimaryKeyColumns()); @@ -47,11 +67,18 @@ public IEnumerable GetPrimaryKeyColumns() return EntityType.FindPrimaryKey().Properties.Select(o => o.GetColumnName(this.StoreObjectIdentifier)); } - internal IEnumerable GetAutoGeneratedColumns() + internal IEnumerable GetAutoGeneratedColumns(IEntityType entityType = null) { - return EntityType.GetProperties().Where(o => o.ValueGenerated != ValueGenerated.Never) + entityType = entityType ?? this.EntityType; + return entityType.GetProperties().Where(o => o.ValueGenerated != ValueGenerated.Never) .Select(o => o.GetColumnName(this.StoreObjectIdentifier)); } + + internal IEnumerable GetSchemaQualifiedTableNames() + { + return EntityTypes + .Select(o => o.GetSchemaQualifiedTableName()).Distinct(); + } } } diff --git a/N.EntityFrameworkCore.Extensions/Sql/SqlExpression.cs b/N.EntityFrameworkCore.Extensions/Sql/SqlExpression.cs new file mode 100644 index 0000000..2b98dd3 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions/Sql/SqlExpression.cs @@ -0,0 +1,80 @@ +using Microsoft.EntityFrameworkCore.Metadata.Internal; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Runtime.InteropServices.ObjectiveC; +using System.Text; +using System.Threading.Tasks; + +namespace N.EntityFrameworkCore.Extensions.Sql +{ + internal class SqlExpression + { + internal SqlExpressionType ExpressionType { get; } + List Items { get; set; } + internal string Sql => ToSql(); + string Alias { get; } + public bool IsEmpty => Items.Count == 0; + + SqlExpression(SqlExpressionType expressionType, object item, string alias = null) + { + ExpressionType = expressionType; + Items = new List(); + if (item is IEnumerable values) + { + Items.AddRange(values.ToArray()); + } + else + { + Items.Add(item); + } + Alias = alias; + } + SqlExpression(SqlExpressionType expressionType, object[] items, string alias = null) + { + ExpressionType = expressionType; + Items = new List(); + Items.AddRange(items); + Alias = alias; + } + internal static SqlExpression Columns(IEnumerable columns) + { + return new SqlExpression(SqlExpressionType.Columns, columns); + } + + internal static SqlExpression String(string joinOnCondition) + { + return new SqlExpression(SqlExpressionType.String, joinOnCondition); + } + + internal static SqlExpression Table(string tableName, string alias = null) + { + return new SqlExpression(SqlExpressionType.Table, tableName, alias); + } + + private string ToSql() + { + var values = Items.Select(o => o.ToString()).ToArray(); + StringBuilder sbSql = new StringBuilder(); + if (ExpressionType == SqlExpressionType.Columns) + { + sbSql.Append(string.Join(",", values.Select(c => c.StartsWith("$") || c.StartsWith("[") ? c : $"[{c}]"))); + } + else + { + sbSql.Append(string.Join(",", Items.Select(o => o.ToString()))); + } + if (Alias != null) + { + sbSql.Append(" "); + sbSql.Append(SqlKeyword.As.ToString().ToUpper()); + sbSql.Append(" "); + sbSql.Append(Alias); + } + //var test = Items.Select(o => o.ToString()).ToArray(); + return sbSql.ToString(); + } + } +} diff --git a/N.EntityFrameworkCore.Extensions/Sql/SqlExpressionType.cs b/N.EntityFrameworkCore.Extensions/Sql/SqlExpressionType.cs new file mode 100644 index 0000000..6565fdc --- /dev/null +++ b/N.EntityFrameworkCore.Extensions/Sql/SqlExpressionType.cs @@ -0,0 +1,9 @@ +namespace N.EntityFrameworkCore.Extensions.Sql +{ + public enum SqlExpressionType + { + String, + Table, + Columns + } +} \ No newline at end of file diff --git a/N.EntityFrameworkCore.Extensions/Sql/SqlKeyword.cs b/N.EntityFrameworkCore.Extensions/Sql/SqlKeyword.cs new file mode 100644 index 0000000..9cb2164 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions/Sql/SqlKeyword.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace N.EntityFrameworkCore.Extensions.Sql +{ + public enum SqlKeyword + { + Select, + Delete, + Insert, + Values, + Update, + Merge, + Into, + From, + On, + Where, + Using, + When, + Then, + Matched, + Not, + Output, + As + } +} diff --git a/N.EntityFrameworkCore.Extensions/Sql/SqlPart.cs b/N.EntityFrameworkCore.Extensions/Sql/SqlPart.cs new file mode 100644 index 0000000..7a63601 --- /dev/null +++ b/N.EntityFrameworkCore.Extensions/Sql/SqlPart.cs @@ -0,0 +1,33 @@ +using Microsoft.EntityFrameworkCore.Query.SqlExpressions; +using Microsoft.Identity.Client; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using System.Threading.Tasks; + +namespace N.EntityFrameworkCore.Extensions.Sql +{ + internal class SqlPart + { + internal SqlKeyword Keyword { get; } + internal SqlExpression Expression { get; } + internal bool IgnoreOutput => GetIgnoreOutput(); + + public SqlPart(SqlKeyword keyword, SqlExpression expression) + { + Keyword = keyword; + Expression = expression; + } + private bool GetIgnoreOutput() + { + if (Keyword == SqlKeyword.Output && (Expression == null || Expression.IsEmpty)) + return true; + else + return false; + } + + + } +} diff --git a/N.EntityFrameworkCore.Extensions/Sql/SqlStatement.cs b/N.EntityFrameworkCore.Extensions/Sql/SqlStatement.cs new file mode 100644 index 0000000..0e2891a --- /dev/null +++ b/N.EntityFrameworkCore.Extensions/Sql/SqlStatement.cs @@ -0,0 +1,78 @@ +using Microsoft.Extensions.Options; +using N.EntityFrameworkCore.Extensions.Util; +using System; +using System.Collections.Generic; +using System.Data.SqlTypes; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace N.EntityFrameworkCore.Extensions.Sql +{ + internal class SqlStatement + { + internal string Sql => ToSql(); + List SqlParts { get; } + SqlStatement() + { + SqlParts = new List(); + } + //static SqlStatement CreateSelectInto(TableMapping souceTableMapping, string targetTable, string[] columns) + //{ + // foreach(var property in souceTableMapping.Properties) + // { + // var t = property; + // } + // var statement = new SqlStatement(); + // statement.CreatePart(SqlKeyword.Select, SqlPartExpression.Columns("column1","column2")); + // statement.CreatePart(SqlKeyword.Into, SqlPartExpression.Table(targetTable)); + // statement.CreatePart(SqlKeyword.From, SqlPartExpression.Table("Table")); + // return null; + //} + internal void CreatePart(SqlKeyword keyword, SqlExpression expression = null) + { + SqlParts.Add(new SqlPart(keyword, expression)); + } + internal static SqlStatement CreateMergeInsert(string sourceTableName, string targetTableName, string joinOnCondition, IEnumerable insertColumns, IEnumerable outputColumns) + { + var statement = new SqlStatement(); + statement.CreatePart(SqlKeyword.Merge, SqlExpression.Table(targetTableName, "t")); + statement.CreatePart(SqlKeyword.Using, SqlExpression.Table(sourceTableName, "s")); + statement.CreatePart(SqlKeyword.On, SqlExpression.String(joinOnCondition)); + statement.CreatePart(SqlKeyword.When); + statement.CreatePart(SqlKeyword.Not); + statement.CreatePart(SqlKeyword.Matched); + statement.CreatePart(SqlKeyword.Then); + statement.CreatePart(SqlKeyword.Insert, SqlExpression.Columns(insertColumns)); + statement.CreatePart(SqlKeyword.Values, SqlExpression.Columns(insertColumns)); + statement.CreatePart(SqlKeyword.Output, SqlExpression.Columns(outputColumns)); + return statement; + } + + private string ToSql() + { + StringBuilder sbSql = new StringBuilder(); + foreach(var part in SqlParts) + { + if (!part.IgnoreOutput) + { + sbSql.Append(part.Keyword.ToString().ToUpper() + " "); + bool useParenthese = part.Keyword == SqlKeyword.Insert || part.Keyword == SqlKeyword.Values; + string format = useParenthese ? "({0})" : "{0}"; + + if (part.Expression != null) + { + sbSql.Append(string.Format(format, part.Expression.Sql)); + sbSql.Append(" "); + } + } + } + //Output a semicolon for certain SQL Statments + if(SqlParts.First().Keyword == SqlKeyword.Merge) + { + sbSql.Append(";"); + } + return sbSql.ToString(); + } + } +} From 4827e1e7b31a9983451023b388107c10fc547afe Mon Sep 17 00:00:00 2001 From: NorthernLight1 <49600465+NorthernLight1@users.noreply.github.com> Date: Sun, 17 Dec 2023 01:07:19 -0500 Subject: [PATCH 4/5] Update LICENSE Changed License from GPL to MIT --- LICENSE | 695 ++------------------------------------------------------ 1 file changed, 21 insertions(+), 674 deletions(-) diff --git a/LICENSE b/LICENSE index f288702..b27db94 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +MIT License + +Copyright (c) 2023 NorthernLight1 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 1182733a420742178ecd50a718fb4e89a65720e8 Mon Sep 17 00:00:00 2001 From: NorthernLight1 <49600465+NorthernLight1@users.noreply.github.com> Date: Sun, 17 Dec 2023 01:44:40 -0500 Subject: [PATCH 5/5] Update N.EntityFrameworkCore.Extensions.csproj Updated copyright to 2023 Added path to Readme File --- .../N.EntityFrameworkCore.Extensions.csproj | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj b/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj index f8b03ea..24172cb 100644 --- a/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj +++ b/N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj @@ -6,18 +6,26 @@ true https://github.com/NorthernLight1/N.EntityFrameworkCore.Extensions/ Northern25 - Copyright © 2022 + Copyright © 2023 N.EntityFrameworkCore.Extensions extends your DbContext in EF Core with high-performance bulk operations: BulkDelete, BulkInsert, BulkMerge, BulkSync, BulkUpdate, Fetch, DeleteFromQuery, InsertFromQuery, UpdateFromQuery. Inheritance models supported: Table-Per-Hierarchy MIT + README.md 5 + + + True + \ + + +