- 修复 DbContext/Repository Update 不更新 DbUpdateValue 的问题；#219

28810 · 28810 · commit f22f65fee9de · 2020-02-28T10:41:03.000+08:00
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/FreeSql.Tests.Provider.MySqlConnector.csproj b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/FreeSql.Tests.Provider.MySqlConnector.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.LazyLoading\FreeSql.Extensions.LazyLoading.csproj" />
+    <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
     <ProjectReference Include="..\..\FreeSql\FreeSql.csproj" />
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.MySqlConnector\FreeSql.Provider.MySqlConnector.csproj" />
   </ItemGroup>
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.MySqlConnector/MySqlConnector/MySqlCodeFirstTest.cs
@@ -57,6 +57,30 @@ class tbdot01
             Assert.Equal(item.����, item2.����);
 
             g.mysql.Update<�������ı�2>().SetSource(item2).ExecuteAffrows();
+
+
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.mysql.Update<�������ı�2>().SetSource(item).ExecuteAffrows());
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.mysql.GetRepository<�������ı�2>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�2
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/DamengCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Dameng/DamengCodeFirstTest.cs
@@ -28,6 +28,28 @@ public class DamengCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.dameng.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.dameng.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.dameng.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.dameng.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.dameng.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/OdbcCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Default/OdbcCodeFirstTest.cs
@@ -25,6 +25,28 @@ public void 中文表_字段()
             Assert.NotNull(item2);
             Assert.Equal(item.编号, item2.编号);
             Assert.Equal(item.标题, item2.标题);
+
+            item.标题 = "测试标题更新";
+            Assert.Equal(1, g.odbc.Update<测试中文表>().SetSource(item).ExecuteAffrows());
+            item2 = g.odbc.Select<测试中文表>().Where(a => a.编号 == item.编号).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.编号, item2.编号);
+            Assert.Equal(item.标题, item2.标题);
+
+            item.标题 = "测试标题更新_repo";
+            var repo = g.odbc.GetRepository<测试中文表>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.odbc.Select<测试中文表>().Where(a => a.编号 == item.编号).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.编号, item2.编号);
+            Assert.Equal(item.标题, item2.标题);
+
+            item.标题 = "测试标题更新_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.odbc.Select<测试中文表>().Where(a => a.编号 == item.编号).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.编号, item2.编号);
+            Assert.Equal(item.标题, item2.标题);
         }
         class 测试中文表
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/MySql/MySqlCodeFirstTest.cs
@@ -55,6 +55,28 @@ class tbdot01
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.mysql.Update<�������ı�2>().SetSource(item).ExecuteAffrows());
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.mysql.GetRepository<�������ı�2>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�2
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/OracleCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/Oracle/OracleCodeFirstTest.cs
@@ -28,6 +28,28 @@ public class OracleCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.oracle.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.oracle.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.oracle.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.oracle.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.oracle.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/PostgreSQL/PostgreSQLCodeFirstTest.cs
@@ -32,6 +32,28 @@ public class PostgreSQLCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.pgsql.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.pgsql.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.pgsql.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.pgsql.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.pgsql.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/SqlServerCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Odbc/SqlServer/SqlServerCodeFirstTest.cs
@@ -29,6 +29,28 @@ public class SqlServerCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.sqlserver.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.sqlserver.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.sqlserver.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.sqlserver.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.sqlserver.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/MsAccess/MsAccessCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/MsAccess/MsAccessCodeFirstTest.cs
@@ -28,6 +28,28 @@ public class MsAccessCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.msaccess.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.msaccess.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.msaccess.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.msaccess.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.msaccess.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/MySql/MySqlCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/MySql/MySqlCodeFirstTest.cs
@@ -52,6 +52,28 @@ class tbdot01
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.����22 = "���Ա������";
+            Assert.Equal(1, g.mysql.Update<�������ı�2>().SetSource(item).ExecuteAffrows());
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����22, item2.����22);
+
+            item.����22 = "���Ա������_repo";
+            var repo = g.mysql.GetRepository<�������ı�2>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����22, item2.����22);
+
+            item.����22 = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.mysql.Select<�������ı�2>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����22, item2.����22);
         }
         class �������ı�2
         {
@@ -60,6 +82,8 @@ class tbdot01
 
             public string ���� { get; protected set; }
 
+            public string ����22 { get; set; }
+
             [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
             public DateTime ����ʱ�� { get; protected set; }
 
@@ -68,7 +92,7 @@ class tbdot01
 
             public static �������ı�2 Create(string title, DateTime ctm)
             {
-                return new �������ı�2 { ���� = title, ����ʱ�� = ctm };
+                return new �������ı�2 { ���� = title, ����22 = title, ����ʱ�� = ctm };
             }
         }
 
diff --git a/FreeSql.Tests/FreeSql.Tests/Oracle/OracleCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/Oracle/OracleCodeFirstTest.cs
@@ -28,6 +28,28 @@ public class OracleCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.oracle.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.oracle.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.oracle.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.oracle.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.oracle.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLCodeFirstTest.cs
@@ -35,6 +35,28 @@ public class PostgreSQLCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.pgsql.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.pgsql.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.pgsql.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.pgsql.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.pgsql.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/SqlServerCodeFirstTest.cs
@@ -29,6 +29,28 @@ public class SqlServerCodeFirstTest
             Assert.NotNull(item2);
             Assert.Equal(item.���, item2.���);
             Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������";
+            Assert.Equal(1, g.sqlserver.Update<�������ı�>().SetSource(item).ExecuteAffrows());
+            item2 = g.sqlserver.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo";
+            var repo = g.sqlserver.GetRepository<�������ı�>();
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.sqlserver.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
+
+            item.���� = "���Ա������_repo22";
+            Assert.Equal(1, repo.Update(item));
+            item2 = g.sqlserver.Select<�������ı�>().Where(a => a.��� == item.���).First();
+            Assert.NotNull(item2);
+            Assert.Equal(item.���, item2.���);
+            Assert.Equal(item.����, item2.����);
         }
         class �������ı�
         {
diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteCodeFirstTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/SqliteCodeFirstTest.cs
diff --git a/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs b/FreeSql.Tests/FreeSql.Tests/UnitTest3.cs
diff --git a/FreeSql/Extensions/EntityUtilExtensions.cs b/FreeSql/Extensions/EntityUtilExtensions.cs

-Original file line number
+Diff line change
             Assert.NotNull(item2);
             Assert.Equal(item.编号, item2.编号);
             Assert.Equal(item.标题, item2.标题);
++
 +            item.标题22 = "测试标题更新";
 +            Assert.Equal(1, g.mysql.Update<测试中文表2>().SetSource(item).ExecuteAffrows());
 +            item2 = g.mysql.Select<测试中文表2>().Where(a => a.编号 == item.编号).First();
 +            Assert.NotNull(item2);
 +            Assert.Equal(item.编号, item2.编号);
 +            Assert.Equal(item.标题22, item2.标题22);
++
 +            item.标题22 = "测试标题更新_repo";
 +            var repo = g.mysql.GetRepository<测试中文表2>();
 +            Assert.Equal(1, repo.Update(item));
 +            item2 = g.mysql.Select<测试中文表2>().Where(a => a.编号 == item.编号).First();
 +            Assert.NotNull(item2);
 +            Assert.Equal(item.编号, item2.编号);
 +            Assert.Equal(item.标题22, item2.标题22);
++
 +            item.标题22 = "测试标题更新_repo22";
 +            Assert.Equal(1, repo.Update(item));
 +            item2 = g.mysql.Select<测试中文表2>().Where(a => a.编号 == item.编号).First();
 +            Assert.NotNull(item2);
 +            Assert.Equal(item.编号, item2.编号);
 +            Assert.Equal(item.标题22, item2.标题22);
+        }
         class 测试中文表2
+        {
             public string 标题 { get; protected set; }
 +            public string 标题22 { get; set; }
++
             [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
             public DateTime 创建时间 { get; protected set; }
             public static 测试中文表2 Create(string title, DateTime ctm)
+            {
 -                return new 测试中文表2 { 标题 = title, 创建时间 = ctm };
 +                return new 测试中文表2 { 标题 = title, 标题22 = title, 创建时间 = ctm };
+            }
+        }