add ClearPropertyVersion Method to IEntityPropertyChangedTrackProxy

Ahoo-Wang · Ahoo-Wang · commit 2183cd2c7b7b · 2019-07-22T15:19:34.000+08:00
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>4</VersionMajor>
 		<VersionMinor>0</VersionMinor>
-		<VersionPatch>84</VersionPatch>
+		<VersionPatch>85</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>
diff --git a/src/SmartSql.DIExtension/SmartSql.DIExtension.csproj b/src/SmartSql.DIExtension/SmartSql.DIExtension.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/SmartSql.Test/Entities/EntityProxy.cs b/src/SmartSql.Test/Entities/EntityProxy.cs
@@ -9,6 +9,7 @@ public class EntityProxy : Entity, IEntityPropertyChangedTrackProxy
 
         public EntityProxy(bool enablePropertyChangedTrack)
         {
+            _enablePropertyChangedTrack = enablePropertyChangedTrack;
             _changedVersion = new Dictionary<string, int>(2);
         }
 
@@ -51,6 +52,11 @@ public int GetPropertyVersion(string propName)
             return _changedVersion.TryGetValue(propName, out var count) ? count : 0;
         }
 
+        public void ClearPropertyVersion()
+        {
+            _changedVersion.Clear();
+        }
+
 
         public override long Id
         {
diff --git a/src/SmartSql/Reflection/EntityProxy/EntityProxyFactory.cs b/src/SmartSql/Reflection/EntityProxy/EntityProxyFactory.cs
@@ -51,13 +51,13 @@ public Type CreateProxyType(Type entityType)
 
             BuildGetEnableTrackMethod(typeBuilder, enableTrackField);
             BuildSetEnableTrackMethod(typeBuilder, enableTrackField);
-
-            var onUpdatedMethodInfo = BuildOnUpdatedMethod(typeBuilder, enableTrackField, changedVersionField);
+            BuildClearPropertyVersionMethod(typeBuilder, changedVersionField);
+            var onPropertyChangedMethodInfo = BuildOnPropertyChangedMethod(typeBuilder, enableTrackField, changedVersionField);
             BuildGetPropertyVersionMethod(typeBuilder, enableTrackField, changedVersionField);
 
             foreach (var propertyInfo in virtualProperties)
             {
-                BuildSetMethod(typeBuilder, propertyInfo, onUpdatedMethodInfo);
+                BuildSetMethod(typeBuilder, propertyInfo, onPropertyChangedMethodInfo);
             }
 
             return typeBuilder.CreateTypeInfo();
@@ -93,7 +93,23 @@ private MethodBuilder BuildGetEnableTrackMethod(TypeBuilder typeBuilder, FieldBu
             ilGen.Return();
             return getEnableTrackMethodBuilder;
         }
-
+        
+        private MethodBuilder BuildClearPropertyVersionMethod(TypeBuilder typeBuilder, FieldBuilder changedVersionField)
+        {
+            var clearPropertyVersionBuilder = typeBuilder.DefineMethod(
+                nameof(IEntityPropertyChangedTrackProxy.ClearPropertyVersion),
+                MethodAttributes.Public | MethodAttributes.Final | MethodAttributes.HideBySig |
+                MethodAttributes.Virtual | MethodAttributes.NewSlot | MethodAttributes.SpecialName,
+                CommonType.Void,
+                Type.EmptyTypes);
+            var ilGen = clearPropertyVersionBuilder.GetILGenerator();
+            ilGen.LoadArg(0);
+            ilGen.FieldGet(changedVersionField);
+            ilGen.Call(DictionaryStringIntType.Method.Clear);
+            ilGen.Return();
+            return clearPropertyVersionBuilder;
+        }
+        
         private void BuildCtor(TypeBuilder typeBuilder, Type entityType, FieldBuilder changedVersionField,
             int propertyCount)
         {
@@ -125,7 +141,7 @@ private void BuildCtor(TypeBuilder typeBuilder, Type entityType, FieldBuilder ch
             }
         }
 
-        private void BuildSetMethod(TypeBuilder typeBuilder, PropertyInfo propertyInfo, MethodInfo onUpdatedMethodInfo)
+        private void BuildSetMethod(TypeBuilder typeBuilder, PropertyInfo propertyInfo, MethodInfo onPropertyChangedMethodInfo)
         {
             var setMethod = propertyInfo.SetMethod;
             var paramTypes = setMethod.GetParameters().Select(p => p.ParameterType).ToArray();
@@ -139,7 +155,7 @@ private void BuildSetMethod(TypeBuilder typeBuilder, PropertyInfo propertyInfo,
 
             ilGen.LoadArg(0);
             ilGen.LoadString(propertyInfo.Name);
-            ilGen.Call(onUpdatedMethodInfo);
+            ilGen.Call(onPropertyChangedMethodInfo);
             ilGen.Return();
         }
 
@@ -155,7 +171,7 @@ private void BuildGetMethod(TypeBuilder typeBuilder, PropertyInfo propertyInfo)
             ilGen.Return();
         }
 
-        private MethodInfo BuildOnUpdatedMethod(TypeBuilder typeBuilder, FieldBuilder enableTrackField,
+        private MethodInfo BuildOnPropertyChangedMethod(TypeBuilder typeBuilder, FieldBuilder enableTrackField,
             FieldBuilder changedVersionField)
         {
             var onUpdatedBuilder = typeBuilder.DefineMethod(nameof(IEntityPropertyChangedTrackProxy.OnPropertyChanged),
diff --git a/src/SmartSql/Reflection/EntityProxy/IEntityPropertyChangedTrackProxy.cs b/src/SmartSql/Reflection/EntityProxy/IEntityPropertyChangedTrackProxy.cs
@@ -9,5 +9,6 @@ public interface IEntityPropertyChangedTrackProxy
         void SetEnablePropertyChangedTrack(bool enablePropertyChangedTrack);
         void OnPropertyChanged(string propName);
         int GetPropertyVersion(string propName);
+        void ClearPropertyVersion();
     }
 }
diff --git a/src/SmartSql/Reflection/TypeConstants/DictionaryStringIntType.cs b/src/SmartSql/Reflection/TypeConstants/DictionaryStringIntType.cs
@@ -10,15 +10,16 @@ public static class DictionaryStringIntType
 
         public static class Method
         {
-            public static readonly MethodInfo TryGetValue = Type.GetMethod("TryGetValue");
-            
+            public static readonly MethodInfo TryGetValue = Type.GetMethod(nameof(Dictionary<String, int>.TryGetValue));
+
             public static readonly MethodInfo IndexerSet = Type.GetMethod("set_Item");
-            public static readonly MethodInfo Add = Type.GetMethod("Add");
+            public static readonly MethodInfo Add = Type.GetMethod(nameof(Dictionary<String, int>.Add));
+            public static readonly MethodInfo Clear = Type.GetMethod(nameof(Dictionary<String, int>.Clear));
         }
-        
+
         public static class Ctor
         {
-            public static readonly ConstructorInfo Capacity = Type.GetConstructor(new Type[] { CommonType.Int32 });
+            public static readonly ConstructorInfo Capacity = Type.GetConstructor(new Type[] {CommonType.Int32});
         }
     }
 }
diff --git a/src/SmartSql/Reflection/TypeConstants/IDataReaderDeserializerType.cs b/src/SmartSql/Reflection/TypeConstants/IDataReaderDeserializerType.cs
@@ -11,8 +11,8 @@ public static class IDataReaderDeserializerType
         public static readonly Type Type = typeof(IDataReaderDeserializer);
         public static class Method
         {
-            public static readonly MethodInfo ToSinge = Type.GetMethod("ToSinge");
-            public static readonly MethodInfo ToList = Type.GetMethod("ToList");
+            public static readonly MethodInfo ToSinge = Type.GetMethod(nameof(IDataReaderDeserializer.ToSinge));
+            public static readonly MethodInfo ToList = Type.GetMethod(nameof(IDataReaderDeserializer.ToList));
             public static MethodInfo MakeGenericToSinge(Type resultType)
             {
                 return ToSinge.MakeGenericMethod(resultType);
diff --git a/src/SmartSql/Reflection/TypeConstants/ISqlMapperType.cs b/src/SmartSql/Reflection/TypeConstants/ISqlMapperType.cs
@@ -10,19 +10,19 @@ public static class ISqlMapperType
         public static readonly Type Type = typeof(ISqlMapper);
         public static class Method
         {
-            public static readonly MethodInfo Execute = Type.GetMethod("Execute");
-            public static readonly MethodInfo ExecuteScalar = Type.GetMethod("ExecuteScalar");
-            public static readonly MethodInfo Query = Type.GetMethod("Query");
-            public static readonly MethodInfo QuerySingle = Type.GetMethod("QuerySingle");
-            public static readonly MethodInfo GetDataSet = Type.GetMethod("GetDataSet");
-            public static readonly MethodInfo GetDataTable = Type.GetMethod("GetDataTable");
+            public static readonly MethodInfo Execute = Type.GetMethod(nameof(ISqlMapper.Execute));
+            public static readonly MethodInfo ExecuteScalar = Type.GetMethod(nameof(ISqlMapper.ExecuteScalar));
+            public static readonly MethodInfo Query = Type.GetMethod(nameof(ISqlMapper.Query));
+            public static readonly MethodInfo QuerySingle = Type.GetMethod(nameof(ISqlMapper.QuerySingle));
+            public static readonly MethodInfo GetDataSet = Type.GetMethod(nameof(ISqlMapper.GetDataSet));
+            public static readonly MethodInfo GetDataTable = Type.GetMethod(nameof(ISqlMapper.GetDataTable));
 
-            public static readonly MethodInfo ExecuteAsync = Type.GetMethod("ExecuteAsync");
-            public static readonly MethodInfo ExecuteScalarAsync = Type.GetMethod("ExecuteScalarAsync");
-            public static readonly MethodInfo QueryAsync = Type.GetMethod("QueryAsync");
-            public static readonly MethodInfo QuerySingleAsync = Type.GetMethod("QuerySingleAsync");
-            public static readonly MethodInfo GetDataSetAsync = Type.GetMethod("GetDataSetAsync");
-            public static readonly MethodInfo GetDataTableAsync = Type.GetMethod("GetDataTableAsync");
+            public static readonly MethodInfo ExecuteAsync = Type.GetMethod(nameof(ISqlMapper.ExecuteAsync));
+            public static readonly MethodInfo ExecuteScalarAsync = Type.GetMethod(nameof(ISqlMapper.ExecuteScalarAsync));
+            public static readonly MethodInfo QueryAsync = Type.GetMethod(nameof(ISqlMapper.QueryAsync));
+            public static readonly MethodInfo QuerySingleAsync = Type.GetMethod(nameof(ISqlMapper.QuerySingleAsync));
+            public static readonly MethodInfo GetDataSetAsync = Type.GetMethod(nameof(ISqlMapper.GetDataSetAsync));
+            public static readonly MethodInfo GetDataTableAsync = Type.GetMethod(nameof(ISqlMapper.GetDataTableAsync));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public class EntityProxy : Entity, IEntityPropertyChangedTrackProxy`
`9`	`9`
`10`	`10`	`public EntityProxy(bool enablePropertyChangedTrack)`
`11`	`11`	`{`
	`12`	`+ _enablePropertyChangedTrack = enablePropertyChangedTrack;`
`12`	`13`	`_changedVersion = new Dictionary<string, int>(2);`
`13`	`14`	`}`
`14`	`15`
`@@ -51,6 +52,11 @@ public int GetPropertyVersion(string propName)`
`51`	`52`	`return _changedVersion.TryGetValue(propName, out var count) ? count : 0;`
`52`	`53`	`}`
`53`	`54`
	`55`	`+ public void ClearPropertyVersion()`
	`56`	`+ {`
	`57`	`+ _changedVersion.Clear();`
	`58`	`+ }`
	`59`	`+`
`54`	`60`
`55`	`61`	`public override long Id`
`56`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ public interface IEntityPropertyChangedTrackProxy`
`9`	`9`	`void SetEnablePropertyChangedTrack(bool enablePropertyChangedTrack);`
`10`	`10`	`void OnPropertyChanged(string propName);`
`11`	`11`	`int GetPropertyVersion(string propName);`
	`12`	`+ void ClearPropertyVersion();`
`12`	`13`	`}`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,16 @@ public static class DictionaryStringIntType`
`10`	`10`
`11`	`11`	`public static class Method`
`12`	`12`	`{`
`13`		`- public static readonly MethodInfo TryGetValue = Type.GetMethod("TryGetValue");`
`14`		`-`
	`13`	`+ public static readonly MethodInfo TryGetValue = Type.GetMethod(nameof(Dictionary<String, int>.TryGetValue));`
	`14`	`+`
`15`	`15`	`public static readonly MethodInfo IndexerSet = Type.GetMethod("set_Item");`
`16`		`- public static readonly MethodInfo Add = Type.GetMethod("Add");`
	`16`	`+ public static readonly MethodInfo Add = Type.GetMethod(nameof(Dictionary<String, int>.Add));`
	`17`	`+ public static readonly MethodInfo Clear = Type.GetMethod(nameof(Dictionary<String, int>.Clear));`
`17`	`18`	`}`
`18`		`-`
	`19`	`+`
`19`	`20`	`public static class Ctor`
`20`	`21`	`{`
`21`		`- public static readonly ConstructorInfo Capacity = Type.GetConstructor(new Type[] { CommonType.Int32 });`
	`22`	`+ public static readonly ConstructorInfo Capacity = Type.GetConstructor(new Type[] {CommonType.Int32});`
`22`	`23`	`}`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ public static class IDataReaderDeserializerType`
`11`	`11`	`public static readonly Type Type = typeof(IDataReaderDeserializer);`
`12`	`12`	`public static class Method`
`13`	`13`	`{`
`14`		`- public static readonly MethodInfo ToSinge = Type.GetMethod("ToSinge");`
`15`		`- public static readonly MethodInfo ToList = Type.GetMethod("ToList");`
	`14`	`+ public static readonly MethodInfo ToSinge = Type.GetMethod(nameof(IDataReaderDeserializer.ToSinge));`
	`15`	`+ public static readonly MethodInfo ToList = Type.GetMethod(nameof(IDataReaderDeserializer.ToList));`
`16`	`16`	`public static MethodInfo MakeGenericToSinge(Type resultType)`
`17`	`17`	`{`
`18`	`18`	`return ToSinge.MakeGenericMethod(resultType);`