Merge pull request #490 from phnx47/fix-init-logical-deletion-for-joins

Fix initialization of logical deletion for joins

Author: phnx47

src/SqlGenerator/SqlGenerator.InitLogicalDeleted.cs

@@ -7,7 +7,6 @@
 
 namespace MicroOrm.Dapper.Repositories.SqlGenerator;
 
-
 public partial class SqlGenerator<TEntity>
     where TEntity : class
 {
@@ -28,7 +27,8 @@ private void InitLogicalDeleted()
                 continue;
 
             JoinsLogicalDelete ??= new Dictionary<string, PropertyInfo>();
-            JoinsLogicalDelete.Add(joinAttr.TableName, deleteAttr);
+            if (!JoinsLogicalDelete.ContainsKey(joinAttr.TableName))
+                JoinsLogicalDelete.Add(joinAttr.TableName, deleteAttr);
         }
 
 

tests/Repositories.MSSQL.Tests/DatabaseFixture.cs

@@ -37,7 +37,7 @@ void CreateSchema(string dbSchema)
         Db.Connection.Execute(@"CREATE TABLE Cities (Identifier uniqueidentifier not null, Name varchar(256) not null)");
         Db.Connection.Execute(@"CREATE TABLE Reports (Id int not null, AnotherId int not null, UserId int not null,  PRIMARY KEY (Id, AnotherId))");
         Db.Connection.Execute(
-            @"CREATE TABLE DAB.Phones (Id int IDENTITY(1,1) not null, PNumber varchar(256) not null, IsActive bit not null, Code varchar(256) not null, PRIMARY KEY (Id))");
+            @"CREATE TABLE DAB.Phones (Id int IDENTITY(1,1) not null, PNumber varchar(256) not null, IsActive bit not null, Code varchar(256) not null, Deleted bit, PRIMARY KEY (Id))");
 
         InitData.Execute(Db);
     }

tests/Repositories.MySql.Tests/DatabaseFixture.cs

@@ -34,7 +34,7 @@ private void InitDb()
         Db.Connection.Execute($"USE `DAB`");
         Db.Connection.Execute("CREATE TABLE IF NOT EXISTS `Phones` " +
                               "(`Id` int not null auto_increment, `PNumber` varchar(256) not null, " +
-                              "`IsActive` boolean not null, `Code` varchar(256) not null, PRIMARY KEY  (`Id`));");
+                              "`IsActive` boolean not null, `Code` varchar(256) not null, `Deleted` boolean, PRIMARY KEY  (`Id`));");
 
         Db.Connection.Execute($"USE `{_dbName}`");
 

tests/Repositories.Oracle.Tests/DatabaseFixture.cs

@@ -67,6 +67,7 @@ ID NUMBER GENERATED ALWAYS AS IDENTITY(START WITH 1 INCREMENT BY 1),
                   PNUMBER VARCHAR(256) NOT NULL,
                   ISACTIVE NUMBER(1) NOT NULL,
                   CODE VARCHAR(256) NOT NULL,
+                  DELETED NUMBER,
                   PRIMARY KEY  (ID))");
 
         Db.Connection.Execute(

tests/Repositories.PostgreSQL.Tests/DatabaseFixture.cs

@@ -47,7 +47,7 @@ void CreateSchema(string dbSchema)
         Db.Connection.Execute(@"CREATE TABLE Cities (Identifier uuid not null, Name varchar(256) not null)");
         Db.Connection.Execute(@"CREATE TABLE Reports (Id int not null, AnotherId int not null, UserId int not null,  PRIMARY KEY (Id, AnotherId))");
         Db.Connection.Execute(
-            @"CREATE TABLE DAB.Phones (Id SERIAL not null, PNumber varchar(256) not null, IsActive bool not null, Code varchar(256) not null, PRIMARY KEY (Id))");
+            @"CREATE TABLE DAB.Phones (Id SERIAL not null, PNumber varchar(256) not null, IsActive bool not null, Code varchar(256) not null, Deleted bool, PRIMARY KEY (Id))");
 
         InitData.Execute(Db);
     }

tests/Repositories.SQLite.Tests/DatabaseFixture.cs

@@ -23,7 +23,7 @@ private void InitDb()
     {
         Db.Connection.Execute("CREATE TABLE `DAB.Phones` " +
                               "(`Id` integer not null primary key autoincrement, `PNumber` varchar(256) not null, " +
-                              "`IsActive` boolean not null, `Code` varchar(256) not null);");
+                              "`IsActive` boolean not null, `Code` varchar(256) not null, `Deleted` boolean);");
 
         Db.Connection.Execute("CREATE TABLE `Users` " +
                               "(`Id` integer not null primary key autoincrement, `Name` varchar(256) not null, `AddressId` integer not null, `PhoneId` integer not null, " +

tests/SqlGenerator.Tests/MsSqlGeneratorTests.cs

@@ -7,39 +7,39 @@
 
 namespace SqlGenerator.Tests;
 
-public class PostgresSqlGeneratorTests
+public class PostgresGeneratorTests
 {
     private const SqlProvider _sqlConnector = SqlProvider.PostgreSQL;
 
     [Fact]
     public static void Count()
     {
-        ISqlGenerator<User> userSqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
-        var sqlQuery = userSqlGenerator.GetCount(null);
+        var sqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
+        var sqlQuery = sqlGenerator.GetCount(null);
         Assert.Equal("SELECT COUNT(*) FROM \"Users\" WHERE \"Users\".\"Deleted\" IS NULL", sqlQuery.GetSql());
     }
 
     [Fact]
     public static void CountWithDistinct()
     {
-        ISqlGenerator<User> userSqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
-        var sqlQuery = userSqlGenerator.GetCount(null, user => user.AddressId);
+        var sqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
+        var sqlQuery = sqlGenerator.GetCount(null, user => user.AddressId);
         Assert.Equal("SELECT COUNT(DISTINCT \"Users\".\"AddressId\") FROM \"Users\" WHERE \"Users\".\"Deleted\" IS NULL", sqlQuery.GetSql());
     }
 
     [Fact]
     public static void CountWithDistinctAndWhere()
     {
-        ISqlGenerator<User> userSqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
-        var sqlQuery = userSqlGenerator.GetCount(x => x.PhoneId == 1, user => user.AddressId);
+        var sqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
+        var sqlQuery = sqlGenerator.GetCount(x => x.PhoneId == 1, user => user.AddressId);
         Assert.Equal("SELECT COUNT(DISTINCT \"Users\".\"AddressId\") FROM \"Users\" WHERE (\"Users\".\"PhoneId\" = @PhoneId_p0) AND \"Users\".\"Deleted\" IS NULL",
             sqlQuery.GetSql());
     }
 
     [Fact]
     public void SelectLimit()
     {
-        ISqlGenerator<City> sqlGenerator = new SqlGenerator<City>(_sqlConnector);
+        var sqlGenerator = new SqlGenerator<City>(_sqlConnector);
         var filterData = new FilterData();
         var data = filterData.LimitInfo ?? new LimitInfo();
         data.Limit = 10u;
@@ -52,7 +52,7 @@ public void SelectLimit()
     [Fact]
     public void SelectOrderBy()
     {
-        ISqlGenerator<City> sqlGenerator = new SqlGenerator<City>(_sqlConnector);
+        var sqlGenerator = new SqlGenerator<City>(_sqlConnector);
         var filterData = new FilterData();
         var data = filterData.OrderInfo ?? new OrderInfo();
         data.Columns = new List<string> { "Name" };
@@ -66,7 +66,7 @@ public void SelectOrderBy()
     [Fact]
     public void SelectOrderByWithTableIdentifier_QuoMarks()
     {
-        ISqlGenerator<City> sqlGenerator = new SqlGenerator<City>(_sqlConnector, true);
+        var sqlGenerator = new SqlGenerator<City>(_sqlConnector, true);
         var filterData = new FilterData();
         var data = filterData.OrderInfo ?? new OrderInfo();
         data.Columns = new List<string> { "Cities.Name" };
@@ -81,7 +81,7 @@ public void SelectOrderByWithTableIdentifier_QuoMarks()
     [Fact]
     public void SelectPaged()
     {
-        ISqlGenerator<City> sqlGenerator = new SqlGenerator<City>(_sqlConnector);
+        var sqlGenerator = new SqlGenerator<City>(_sqlConnector);
         var filterData = new FilterData();
         var data = filterData.LimitInfo ?? new LimitInfo();
         data.Limit = 10u;
@@ -95,24 +95,24 @@ public void SelectPaged()
     [Fact]
     public void SelectFirst()
     {
-        ISqlGenerator<City> sqlGenerator = new SqlGenerator<City>(_sqlConnector);
+        var sqlGenerator = new SqlGenerator<City>(_sqlConnector);
         var sqlQuery = sqlGenerator.GetSelectFirst(x => x.Identifier == Guid.Empty, null);
         Assert.Equal("SELECT Cities.Identifier, Cities.Name FROM Cities WHERE Cities.Identifier = @Identifier_p0 LIMIT 1", sqlQuery.GetSql());
     }
 
     [Fact]
     public void SelectFirst_QuoMarks()
     {
-        ISqlGenerator<City> sqlGenerator = new SqlGenerator<City>(_sqlConnector, true);
+        var sqlGenerator = new SqlGenerator<City>(_sqlConnector, true);
         var sqlQuery = sqlGenerator.GetSelectFirst(x => x.Identifier == Guid.Empty, null);
         Assert.Equal("SELECT \"Cities\".\"Identifier\", \"Cities\".\"Name\" FROM \"Cities\" WHERE \"Cities\".\"Identifier\" = @Identifier_p0 LIMIT 1", sqlQuery.GetSql());
     }
 
     [Fact]
     public static void Update()
     {
-        ISqlGenerator<User> userSqlGenerator = new SqlGenerator<User>(_sqlConnector);
-        var sqlQuery = userSqlGenerator.GetUpdate(new User());
+        var sqlGenerator = new SqlGenerator<User>(_sqlConnector);
+        var sqlQuery = sqlGenerator.GetUpdate(new User());
 
         Assert.Equal("UPDATE Users " +
                      "SET Name = @UserName, " +
@@ -127,8 +127,8 @@ public static void Update()
     [Fact]
     public static void Update_QuoMarks()
     {
-        ISqlGenerator<User> userSqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
-        var sqlQuery = userSqlGenerator.GetUpdate(new User());
+        var sqlGenerator = new SqlGenerator<User>(_sqlConnector, true);
+        var sqlQuery = sqlGenerator.GetUpdate(new User());
 
         Assert.Equal("UPDATE \"Users\" " +
                      "SET \"Name\" = @UserName, " +
@@ -143,32 +143,32 @@ public static void Update_QuoMarks()
     [Fact]
     public static void BulkUpdate()
     {
-        ISqlGenerator<Phone> userSqlGenerator = new SqlGenerator<Phone>(_sqlConnector);
+        var sqlGenerator = new SqlGenerator<Phone>(_sqlConnector);
         var phones = new List<Phone>
         {
-            new Phone { Id = 10, IsActive = true, PNumber = "111" },
-            new Phone { Id = 10, IsActive = false, PNumber = "222" }
+            new() { Id = 10, IsActive = true, PNumber = "111" },
+            new() { Id = 10, IsActive = false, PNumber = "222" }
         };
 
-        var sqlQuery = userSqlGenerator.GetBulkUpdate(phones);
+        var sqlQuery = sqlGenerator.GetBulkUpdate(phones);
 
-        Assert.Equal("UPDATE DAB.Phones SET PNumber = @PNumber0, IsActive = @IsActive0 WHERE Id = @Id0; " +
-                     "UPDATE DAB.Phones SET PNumber = @PNumber1, IsActive = @IsActive1 WHERE Id = @Id1", sqlQuery.GetSql());
+        Assert.Equal("UPDATE DAB.Phones SET PNumber = @PNumber0, IsActive = @IsActive0, Deleted = @Deleted0 WHERE Id = @Id0; " +
+                     "UPDATE DAB.Phones SET PNumber = @PNumber1, IsActive = @IsActive1, Deleted = @Deleted1 WHERE Id = @Id1", sqlQuery.GetSql());
     }
 
     [Fact]
     public static void BulkUpdate_QuoMarks()
     {
-        ISqlGenerator<Phone> userSqlGenerator = new SqlGenerator<Phone>(_sqlConnector, true);
+        var sqlGenerator = new SqlGenerator<Phone>(_sqlConnector, true);
         var phones = new List<Phone>
         {
-            new Phone { Id = 10, IsActive = true, PNumber = "111" },
-            new Phone { Id = 10, IsActive = false, PNumber = "222" }
+            new() { Id = 10, IsActive = true, PNumber = "111" },
+            new() { Id = 10, IsActive = false, PNumber = "222" }
         };
 
-        var sqlQuery = userSqlGenerator.GetBulkUpdate(phones);
+        var sqlQuery = sqlGenerator.GetBulkUpdate(phones);
 
-        Assert.Equal("UPDATE \"DAB\".\"Phones\" SET \"PNumber\" = @PNumber0, \"IsActive\" = @IsActive0 WHERE \"Id\" = @Id0; " +
-                     "UPDATE \"DAB\".\"Phones\" SET \"PNumber\" = @PNumber1, \"IsActive\" = @IsActive1 WHERE \"Id\" = @Id1", sqlQuery.GetSql());
+        Assert.Equal("UPDATE \"DAB\".\"Phones\" SET \"PNumber\" = @PNumber0, \"IsActive\" = @IsActive0, \"Deleted\" = @Deleted0 WHERE \"Id\" = @Id0; " +
+                     "UPDATE \"DAB\".\"Phones\" SET \"PNumber\" = @PNumber1, \"IsActive\" = @IsActive1, \"Deleted\" = @Deleted1 WHERE \"Id\" = @Id1", sqlQuery.GetSql());
     }
 }