add support automatically assigns values ​​to entities using the IdGenerator

Ahoo-Wang · Ahoo-Wang · commit 5bab4225bbd8 · 2019-10-28T17:21:27.000+08:00
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>4</VersionMajor>
 		<VersionMinor>1</VersionMinor>
-		<VersionPatch>32</VersionPatch>
+		<VersionPatch>33</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>
diff --git a/doc/Schema/SmartSqlMap.xsd b/doc/Schema/SmartSqlMap.xsd
@@ -965,6 +965,7 @@
         <xs:complexType>
             <xs:attribute name="Id" type="xs:string" use="required"/>
             <xs:attribute name="Name" type="xs:string" use="optional"/>
+            <xs:attribute name="Assign" type="xs:boolean" use="optional"/>
         </xs:complexType>
     </xs:element>
     <xs:element name="Statement">
diff --git a/src/SmartSql.Test.Unit/DbSessions/DbSessionTest.cs b/src/SmartSql.Test.Unit/DbSessions/DbSessionTest.cs
@@ -18,7 +18,9 @@ public DbSessionTest(SmartSqlFixture smartSqlFixture)
         {
             SqlMapper = smartSqlFixture.SqlMapper;
         }
+
         #region Insert_From_RealSql
+
         private const string INSERT_SQL = @"INSERT INTO T_AllPrimitive
               (Boolean
               ,[Char]
@@ -76,6 +78,7 @@ public DbSessionTest(SmartSqlFixture smartSqlFixture)
               ,@NullableNumericalEnum
               ,@NullableString);
         Select SCOPE_IDENTITY();";
+
         [Fact]
         public void Insert_From_RealSql()
         {
@@ -89,6 +92,7 @@ public void Insert_From_RealSql()
                 }
             });
         }
+
         #endregion
 
         [Fact]
@@ -105,6 +109,7 @@ public void Insert()
                 }
             });
         }
+
         [Fact]
         public void InsertByRequestTransaction()
         {
@@ -120,6 +125,7 @@ public void InsertByRequestTransaction()
                 }
             });
         }
+
         [Fact]
         public void InsertByStatementTransaction()
         {
@@ -134,21 +140,40 @@ public void InsertByStatementTransaction()
                 }
             });
         }
+
         [Fact]
         public void InsertByIdGen()
         {
+            var entity = new AllPrimitive
+            {
+                DateTime = DateTime.Now,
+                String = "SmartSql",
+            };
             var id = SqlMapper.ExecuteScalar<long>(new RequestContext
             {
                 Scope = nameof(AllPrimitive),
                 SqlId = "InsertByIdGen",
-                Request = new AllPrimitive
-                {
-                    DateTime = DateTime.Now,
-                    String = "SmartSql",
-                }
+                Request = entity
             });
         }
 
+        [Fact]
+        public void InsertByIdGenAssignId()
+        {
+            var entity = new AllPrimitive
+            {
+                DateTime = DateTime.Now,
+                String = "SmartSql",
+            };
+            var affected = SqlMapper.Execute(new RequestContext
+            {
+                Scope = nameof(AllPrimitive),
+                SqlId = "InsertByIdGenAssignId",
+                Request = entity
+            });
+            Assert.True(entity.Int64 > 0);
+        }
+
         [Fact]
         public async Task QueryAsync()
         {
@@ -207,6 +232,7 @@ public void Update()
                 }
             });
         }
+
         //[Fact]
         public void Delete()
         {
@@ -221,6 +247,7 @@ public void Delete()
                 }
             });
         }
+
         [Fact]
         public void DeleteCheckIncludeRequired()
         {
@@ -238,6 +265,7 @@ public void DeleteCheckIncludeRequired()
                 Assert.True(true);
             }
         }
+
         [Fact]
         public void DeleteCheckIsNotEmptyRequired()
         {
@@ -257,8 +285,6 @@ public void DeleteCheckIsNotEmptyRequired()
         }
 
 
-
-
         //Create PROCEDURE[dbo].[SP_QueryUser]
         //@Total int = 0 Out
         //    AS
@@ -287,6 +313,5 @@ public void SP()
             var list = SqlMapper.Query<User>(context);
             dbParameterCollection.TryGetParameterValue("Total", out int total);
         }
-
     }
-}
+}
diff --git a/src/SmartSql.Test.Unit/Maps/AllPrimitive.xml b/src/SmartSql.Test.Unit/Maps/AllPrimitive.xml
@@ -270,7 +270,7 @@
       ;Select Scope_Identity();
     </Statement>
     <Statement Id="InsertByIdGen">
-      <IdGenerator Id="Int64"/>
+      <IdGenerator Id="Int64" Assign="false"/>
       INSERT INTO T_AllPrimitive
       (
       Boolean,
@@ -333,6 +333,69 @@
       )
       ;Select @Int64;
     </Statement>
+    <Statement Id="InsertByIdGenAssignId">
+      <IdGenerator Id="Int64"/>
+      INSERT INTO T_AllPrimitive
+      (
+      Boolean,
+      Char,
+      Byte,
+      Int16,
+      Int32,
+      Int64,
+      Single,
+      Decimal,
+      DateTime,
+      String,
+      Guid,
+      TimeSpan,
+      NumericalEnum,
+      NullableBoolean,
+      NullableChar,
+      NullableByte,
+      NullableInt16,
+      NullableInt32,
+      NullableInt64,
+      NullableSingle,
+      NullableDouble,
+      NullableDecimal,
+      NullableDateTime,
+      NullableGuid,
+      NullableTimeSpan,
+      NullableNumericalEnum,
+      NullableString
+      )
+      VALUES
+      (
+      @Boolean,
+      @Char,
+      @Byte,
+      @Int16,
+      @Int32,
+      @Int64,
+      @Single,
+      @Decimal,
+      @DateTime,
+      @String,
+      @Guid,
+      @TimeSpan,
+      @NumericalEnum,
+      @NullableBoolean,
+      @NullableChar,
+      @NullableByte,
+      @NullableInt16,
+      @NullableInt32,
+      @NullableInt64,
+      @NullableSingle,
+      @NullableDouble,
+      @NullableDecimal,
+      @NullableDateTime,
+      @NullableGuid,
+      @NullableTimeSpan,
+      @NullableNumericalEnum,
+      @NullableString
+      );
+    </Statement>
     <!--删除-->
     <Statement Id="Delete">
       Delete From T_AllPrimitive
diff --git a/src/SmartSql/Configuration/Tags/IdGenerator.cs b/src/SmartSql/Configuration/Tags/IdGenerator.cs
@@ -1,7 +1,10 @@
 ﻿using SmartSql.IdGenerator;
 using System;
 using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection.Emit;
 using System.Text;
+using SmartSql.Reflection.PropertyAccessor;
 
 namespace SmartSql.Configuration.Tags
 {
@@ -11,20 +14,22 @@ public class IdGenerator : ITag
         public string Id { get; set; }
         public Statement Statement { get; set; }
         public ITag Parent { get; set; }
+        public bool Assign { get; set; }
 
         public void BuildSql(AbstractRequestContext context)
         {
             var nextId = IdGen.NextId();
-            if (!context.Parameters.TryAdd(Id, nextId))
-            {
-                context.Parameters.TryGetValue(Id, out Data.SqlParameter sqlParameter);
-                sqlParameter.Value = nextId;
-            }
+            if (context.Parameters.TryAdd(Id, nextId)) return;
+            context.Parameters.TryGetValue(Id, out Data.SqlParameter sqlParameter);
+            sqlParameter.Value = nextId;
+            if (!Assign) return;
+            var sourceRequest = context.GetRequest();
+            EmitSetAccessorFactory.Instance.Create(sourceRequest.GetType(), Id)(sourceRequest, nextId);
         }
 
         public bool IsCondition(AbstractRequestContext context)
         {
             return true;
         }
     }
-}
+}
diff --git a/src/SmartSql/Configuration/Tags/TagBuilders/IdGeneratorBuilder.cs b/src/SmartSql/Configuration/Tags/TagBuilders/IdGeneratorBuilder.cs
@@ -21,12 +21,19 @@ public override ITag Build(XmlNode xmlNode, Statement statement)
                     throw new SmartSqlException($"Can not find IdGenerator.Name:{idGenName},XmlNode:{xmlNode}.");
                 }
             }
+
+            if (!xmlNode.Attributes.TryGetValueAsBoolean(nameof(IdGenerator.Assign), out var assign))
+            {
+                assign = true;
+            }
+
             return new IdGenerator
             {
                 Statement = statement,
                 Id = GetXmlAttributeValue(xmlNode, nameof(IdGenerator.Id)),
-                IdGen = idGen
+                IdGen = idGen,
+                Assign = assign
             };
         }
     }
-}
+}
diff --git a/src/SmartSql/RequestContext.cs b/src/SmartSql/RequestContext.cs
@@ -27,9 +27,9 @@ public abstract class AbstractRequestContext
         public String RealSql { get; set; }
 
         public String AutoConverterName { get; set; }
-        
+
         internal IAutoConverter AutoConverter { get; set; }
-        
+
         /// <summary>
         /// SmartSqlMap.Scope
         /// </summary>
@@ -102,6 +102,7 @@ public CacheKey EnsureCacheKey()
 
         public abstract void SetupParameters();
         public abstract void SetRequest(object requestObj);
+        public abstract Object GetRequest();
 
         /// <summary>
         /// 获取请求实体变更的版本号
@@ -127,6 +128,11 @@ public override void SetRequest(object requestObj)
             Request = (TRequest) requestObj;
         }
 
+        public override object GetRequest()
+        {
+            return Request;
+        }
+
         public override int GetPropertyVersion(string propName)
         {
             if (Request is IEntityPropertyChangedTrackProxy trackProxy)
diff --git a/src/SmartSql/Utils/XmlExtensions.cs b/src/SmartSql/Utils/XmlExtensions.cs
@@ -8,48 +8,57 @@ namespace System.Xml
 {
     public static class XmlExtensions
     {
-        public static bool TryGetValueAsString(this XmlAttributeCollection xmlAttributeCollection, string attrName, out string attrVal, Properties properties = null)
+        public static bool TryGetValueAsString(this XmlAttributeCollection xmlAttributeCollection, string attrName,
+            out string attrVal, Properties properties = null)
         {
             var attr = xmlAttributeCollection[attrName];
             if (attr == null)
             {
                 attrVal = default;
                 return false;
             }
+
             attrVal = attr.Value;
             if (properties != null)
             {
                 attrVal = properties.GetPropertyValue(attr.Value);
             }
+
             return true;
         }
-        public static bool TryGetValueAsBoolean(this XmlAttributeCollection xmlAttributeCollection, string attrName, out bool attrVal, Properties properties = null)
+
+        public static bool TryGetValueAsBoolean(this XmlAttributeCollection xmlAttributeCollection, string attrName,
+            out bool attrVal, Properties properties = null)
         {
             if (xmlAttributeCollection.TryGetValueAsString(attrName, out string attrValStr))
             {
                 if (properties != null)
                 {
                     attrValStr = properties.GetPropertyValue(attrValStr);
                 }
-                Boolean.TryParse(attrValStr, out attrVal);
-                return true;
+
+                return Boolean.TryParse(attrValStr, out attrVal);
             }
+
             attrVal = default;
             return false;
         }
-        public static bool TryGetValueAsInt32(this XmlAttributeCollection xmlAttributeCollection, string attrName, out int attrVal, Properties properties = null)
+
+        public static bool TryGetValueAsInt32(this XmlAttributeCollection xmlAttributeCollection, string attrName,
+            out int attrVal, Properties properties = null)
         {
             if (xmlAttributeCollection.TryGetValueAsString(attrName, out string attrValStr))
             {
                 if (properties != null)
                 {
                     attrValStr = properties.GetPropertyValue(attrValStr);
                 }
-                Int32.TryParse(attrValStr, out attrVal);
-                return true;
+
+                return Int32.TryParse(attrValStr, out attrVal);
             }
+
             attrVal = default;
             return false;
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,9 @@ public DbSessionTest(SmartSqlFixture smartSqlFixture)`
`18`	`18`	`{`
`19`	`19`	`SqlMapper = smartSqlFixture.SqlMapper;`
`20`	`20`	`}`
	`21`	`+`
`21`	`22`	`#region Insert_From_RealSql`
	`23`	`+`
`22`	`24`	`private const string INSERT_SQL = @"INSERT INTO T_AllPrimitive`
`23`	`25`	`(Boolean`
`24`	`26`	`,[Char]`
`@@ -76,6 +78,7 @@ public DbSessionTest(SmartSqlFixture smartSqlFixture)`
`76`	`78`	`,@NullableNumericalEnum`
`77`	`79`	`,@NullableString);`
`78`	`80`	`Select SCOPE_IDENTITY();";`
	`81`	`+`
`79`	`82`	`[Fact]`
`80`	`83`	`public void Insert_From_RealSql()`
`81`	`84`	`{`
`@@ -89,6 +92,7 @@ public void Insert_From_RealSql()`
`89`	`92`	`}`
`90`	`93`	`});`
`91`	`94`	`}`
	`95`	`+`
`92`	`96`	`#endregion`
`93`	`97`
`94`	`98`	`[Fact]`
`@@ -105,6 +109,7 @@ public void Insert()`
`105`	`109`	`}`
`106`	`110`	`});`
`107`	`111`	`}`
	`112`	`+`
`108`	`113`	`[Fact]`
`109`	`114`	`public void InsertByRequestTransaction()`
`110`	`115`	`{`
`@@ -120,6 +125,7 @@ public void InsertByRequestTransaction()`
`120`	`125`	`}`
`121`	`126`	`});`
`122`	`127`	`}`
	`128`	`+`
`123`	`129`	`[Fact]`
`124`	`130`	`public void InsertByStatementTransaction()`
`125`	`131`	`{`
`@@ -134,21 +140,40 @@ public void InsertByStatementTransaction()`
`134`	`140`	`}`
`135`	`141`	`});`
`136`	`142`	`}`
	`143`	`+`
`137`	`144`	`[Fact]`
`138`	`145`	`public void InsertByIdGen()`
`139`	`146`	`{`
	`147`	`+ var entity = new AllPrimitive`
	`148`	`+ {`
	`149`	`+ DateTime = DateTime.Now,`
	`150`	`+ String = "SmartSql",`
	`151`	`+ };`
`140`	`152`	`var id = SqlMapper.ExecuteScalar<long>(new RequestContext`
`141`	`153`	`{`
`142`	`154`	`Scope = nameof(AllPrimitive),`
`143`	`155`	`SqlId = "InsertByIdGen",`
`144`		`- Request = new AllPrimitive`
`145`		`- {`
`146`		`- DateTime = DateTime.Now,`
`147`		`- String = "SmartSql",`
`148`		`- }`
	`156`	`+ Request = entity`
`149`	`157`	`});`
`150`	`158`	`}`
`151`	`159`
	`160`	`+ [Fact]`
	`161`	`+ public void InsertByIdGenAssignId()`
	`162`	`+ {`
	`163`	`+ var entity = new AllPrimitive`
	`164`	`+ {`
	`165`	`+ DateTime = DateTime.Now,`
	`166`	`+ String = "SmartSql",`
	`167`	`+ };`
	`168`	`+ var affected = SqlMapper.Execute(new RequestContext`
	`169`	`+ {`
	`170`	`+ Scope = nameof(AllPrimitive),`
	`171`	`+ SqlId = "InsertByIdGenAssignId",`
	`172`	`+ Request = entity`
	`173`	`+ });`
	`174`	`+ Assert.True(entity.Int64 > 0);`
	`175`	`+ }`
	`176`	`+`
`152`	`177`	`[Fact]`
`153`	`178`	`public async Task QueryAsync()`
`154`	`179`	`{`
`@@ -207,6 +232,7 @@ public void Update()`
`207`	`232`	`}`
`208`	`233`	`});`
`209`	`234`	`}`
	`235`	`+`
`210`	`236`	`//[Fact]`
`211`	`237`	`public void Delete()`
`212`	`238`	`{`
`@@ -221,6 +247,7 @@ public void Delete()`
`221`	`247`	`}`
`222`	`248`	`});`
`223`	`249`	`}`
	`250`	`+`
`224`	`251`	`[Fact]`
`225`	`252`	`public void DeleteCheckIncludeRequired()`
`226`	`253`	`{`
`@@ -238,6 +265,7 @@ public void DeleteCheckIncludeRequired()`
`238`	`265`	`Assert.True(true);`
`239`	`266`	`}`
`240`	`267`	`}`
	`268`	`+`
`241`	`269`	`[Fact]`
`242`	`270`	`public void DeleteCheckIsNotEmptyRequired()`
`243`	`271`	`{`
`@@ -257,8 +285,6 @@ public void DeleteCheckIsNotEmptyRequired()`
`257`	`285`	`}`
`258`	`286`
`259`	`287`
`260`		`-`
`261`		`-`
`262`	`288`	`//Create PROCEDURE[dbo].[SP_QueryUser]`
`263`	`289`	`//@Total int = 0 Out`
`264`	`290`	`// AS`
`@@ -287,6 +313,5 @@ public void SP()`
`287`	`313`	`var list = SqlMapper.Query<User>(context);`
`288`	`314`	`dbParameterCollection.TryGetParameterValue("Total", out int total);`
`289`	`315`	`}`
`290`		`-`
`291`	`316`	`}`
`292`		`-}`
	`317`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,19 @@ public override ITag Build(XmlNode xmlNode, Statement statement)`
`21`	`21`	`throw new SmartSqlException($"Can not find IdGenerator.Name:{idGenName},XmlNode:{xmlNode}.");`
`22`	`22`	`}`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ if (!xmlNode.Attributes.TryGetValueAsBoolean(nameof(IdGenerator.Assign), out var assign))`
	`26`	`+ {`
	`27`	`+ assign = true;`
	`28`	`+ }`
	`29`	`+`
`24`	`30`	`return new IdGenerator`
`25`	`31`	`{`
`26`	`32`	`Statement = statement,`
`27`	`33`	`Id = GetXmlAttributeValue(xmlNode, nameof(IdGenerator.Id)),`
`28`		`- IdGen = idGen`
	`34`	`+ IdGen = idGen,`
	`35`	`+ Assign = assign`
`29`	`36`	`};`
`30`	`37`	`}`
`31`	`38`	`}`
`32`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,48 +8,57 @@ namespace System.Xml`
`8`	`8`	`{`
`9`	`9`	`public static class XmlExtensions`
`10`	`10`	`{`
`11`		`- public static bool TryGetValueAsString(this XmlAttributeCollection xmlAttributeCollection, string attrName, out string attrVal, Properties properties = null)`
	`11`	`+ public static bool TryGetValueAsString(this XmlAttributeCollection xmlAttributeCollection, string attrName,`
	`12`	`+ out string attrVal, Properties properties = null)`
`12`	`13`	`{`
`13`	`14`	`var attr = xmlAttributeCollection[attrName];`
`14`	`15`	`if (attr == null)`
`15`	`16`	`{`
`16`	`17`	`attrVal = default;`
`17`	`18`	`return false;`
`18`	`19`	`}`
	`20`	`+`
`19`	`21`	`attrVal = attr.Value;`
`20`	`22`	`if (properties != null)`
`21`	`23`	`{`
`22`	`24`	`attrVal = properties.GetPropertyValue(attr.Value);`
`23`	`25`	`}`
	`26`	`+`
`24`	`27`	`return true;`
`25`	`28`	`}`
`26`		`- public static bool TryGetValueAsBoolean(this XmlAttributeCollection xmlAttributeCollection, string attrName, out bool attrVal, Properties properties = null)`
	`29`	`+`
	`30`	`+ public static bool TryGetValueAsBoolean(this XmlAttributeCollection xmlAttributeCollection, string attrName,`
	`31`	`+ out bool attrVal, Properties properties = null)`
`27`	`32`	`{`
`28`	`33`	`if (xmlAttributeCollection.TryGetValueAsString(attrName, out string attrValStr))`
`29`	`34`	`{`
`30`	`35`	`if (properties != null)`
`31`	`36`	`{`
`32`	`37`	`attrValStr = properties.GetPropertyValue(attrValStr);`
`33`	`38`	`}`
`34`		`- Boolean.TryParse(attrValStr, out attrVal);`
`35`		`- return true;`
	`39`	`+`
	`40`	`+ return Boolean.TryParse(attrValStr, out attrVal);`
`36`	`41`	`}`
	`42`	`+`
`37`	`43`	`attrVal = default;`
`38`	`44`	`return false;`
`39`	`45`	`}`
`40`		`- public static bool TryGetValueAsInt32(this XmlAttributeCollection xmlAttributeCollection, string attrName, out int attrVal, Properties properties = null)`
	`46`	`+`
	`47`	`+ public static bool TryGetValueAsInt32(this XmlAttributeCollection xmlAttributeCollection, string attrName,`
	`48`	`+ out int attrVal, Properties properties = null)`
`41`	`49`	`{`
`42`	`50`	`if (xmlAttributeCollection.TryGetValueAsString(attrName, out string attrValStr))`
`43`	`51`	`{`
`44`	`52`	`if (properties != null)`
`45`	`53`	`{`
`46`	`54`	`attrValStr = properties.GetPropertyValue(attrValStr);`
`47`	`55`	`}`
`48`		`- Int32.TryParse(attrValStr, out attrVal);`
`49`		`- return true;`
	`56`	`+`
	`57`	`+ return Int32.TryParse(attrValStr, out attrVal);`
`50`	`58`	`}`
	`59`	`+`
`51`	`60`	`attrVal = default;`
`52`	`61`	`return false;`
`53`	`62`	`}`
`54`	`63`	`}`
`55`		`-}`
	`64`	`+}`