1. optimized storage procedure name transfer: From XML / RealSql

Author: Ahoo-Wang

src/SmartSql.UTests/DyRepository/DyRepository_Tests.cs

@@ -24,7 +24,7 @@ public DyRepository_Tests()
 
 
         [Fact]
-        public void SP_QueryByPage()
+        public void SP_QueryByPage_From_XML()
         {
             DbParameterCollection dbParameterCollection = new DbParameterCollection();
             dbParameterCollection.Add(new DbParameter
@@ -33,7 +33,20 @@ public void SP_QueryByPage()
                 DbType = System.Data.DbType.Int32,
                 Direction = System.Data.ParameterDirection.Output
             });
-            var list = _repository.SP_QueryByPage(dbParameterCollection);
+            var list = _repository.SP_QueryByPage_From_XML(dbParameterCollection);
+            var total = dbParameterCollection.GetValue<int>("Total");
+        }
+        [Fact]
+        public void SP_QueryByPage_From_RealSql()
+        {
+            DbParameterCollection dbParameterCollection = new DbParameterCollection();
+            dbParameterCollection.Add(new DbParameter
+            {
+                Name = "Total",
+                DbType = System.Data.DbType.Int32,
+                Direction = System.Data.ParameterDirection.Output
+            });
+            var list = _repository.SP_QueryByPage_From_RealSql(dbParameterCollection);
             var total = dbParameterCollection.GetValue<int>("Total");
         }
         [Fact]

src/SmartSql.UTests/DyRepository/IEntityRepository.cs

@@ -44,7 +44,11 @@ public interface IEntityRepository : IRepository<T_Entity, long>, IRepositoryAsy
         Task<DataSet> QueryDataSetAsync();
         [Statement(Sql = "Select Top(@taken) T.* From T_Entity T With(NoLock);")]
         Task<IEnumerable<T_Entity>> QueryBySqlAsync(int taken);
-        [Statement(CommandType = CommandType.StoredProcedure)]
-        IEnumerable<T_Entity> SP_QueryByPage(DbParameterCollection dbParameterCollection);
+
+        [Statement(Id = "SP_QueryByPage", CommandType = CommandType.StoredProcedure)]
+        IEnumerable<T_Entity> SP_QueryByPage_From_XML(DbParameterCollection dbParameterCollection);
+
+        [Statement(Sql = "SP_QueryByPage", CommandType = CommandType.StoredProcedure)]
+        IEnumerable<T_Entity> SP_QueryByPage_From_RealSql(DbParameterCollection dbParameterCollection);
     }
 }

src/SmartSql.UTests/Maps/T_Entity.xml

@@ -19,9 +19,9 @@
         <Arg Column="FLong" Type="Int64" />
         <Arg Column="FDecimal" Type="Decimal" />
       </Constructor>
+      
     </ResultMap>
   </ResultMaps>
-
   <ParameterMaps>
     <ParameterMap Id="ParameterMap">
       <Parameter Property="" TypeHandler="Json" />
@@ -30,6 +30,9 @@
 
 
   <Statements>
+    <Statement Id="SP_QueryByPage">
+      SP_QueryByPage
+    </Statement>
     <Statement Id="QueryForPlaceholder">
       SELECT Top(10) T.* From <Placeholder Property="TableName"></Placeholder> T With(NoLock)
     </Statement>

src/SmartSql.UTests/SmartSqlMapper_Test.cs

@@ -170,7 +170,7 @@ public void QuerySingle()
         }
 
         [Fact]
-        public void StoredProcedure()
+        public void StoredProcedure_From_XML()
         {
             DbParameterCollection dbParameterCollection = new DbParameterCollection();
             dbParameterCollection.Add(new DbParameter
@@ -182,12 +182,34 @@ public void StoredProcedure()
             RequestContext context = new RequestContext
             {
                 CommandType = System.Data.CommandType.StoredProcedure,
+                Scope = Scope,
                 SqlId = "SP_QueryByPage",
                 Request = dbParameterCollection
             };
             var list = _sqlMapper.Query<T_Entity>(context);
             var total = dbParameterCollection.GetValue<int>("Total");
         }
+
+        [Fact]
+        public void StoredProcedure_From_RealSql()
+        {
+            DbParameterCollection dbParameterCollection = new DbParameterCollection();
+            dbParameterCollection.Add(new DbParameter
+            {
+                Name = "Total",
+                DbType = System.Data.DbType.Int32,
+                Direction = System.Data.ParameterDirection.Output
+            });
+            RequestContext context = new RequestContext
+            {
+                CommandType = System.Data.CommandType.StoredProcedure,
+                RealSql = "SP_QueryByPage",
+                Request = dbParameterCollection
+            };
+            var list = _sqlMapper.Query<T_Entity>(context);
+            var total = dbParameterCollection.GetValue<int>("Total");
+        }
+
         [Fact]
         public void QueryMultiple()
         {

src/SmartSql/Command/PreparedCommand.cs

@@ -103,7 +103,7 @@ public IDbCommand Prepare(IDbConnectionSession dbSession, RequestContext context
                 case CommandType.StoredProcedure:
                     {
                         AddDbParameterCollection(dbCommand, context.RequestParameters);
-                        dbCommand.CommandText = context.SqlId;
+                        dbCommand.CommandText = context.RealSql;
                         break;
                     }
             }

src/SmartSql/SmartSql.csproj

@@ -11,10 +11,10 @@
     <PackageProjectUrl>https://github.com/Ahoo-Wang/SmartSql</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Ahoo-Wang/SmartSql</RepositoryUrl>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <Version>3.5.8</Version>
+    <Version>3.5.9</Version>
     <PackageTags>orm sql read-write-separation cache  redis dotnet-core cross-platform high-performance distributed-computing zookeeper</PackageTags>
     <PackageReleaseNotes>
-      1. fix the cache penetration problem with the cache value of null
+      1. optimized storage procedure name transfer: From XML / RealSql
     </PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/Ahoo-Wang/SmartSql/master/SmartSql.png</PackageIconUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/Ahoo-Wang/SmartSql/master/LICENSE</PackageLicenseUrl>

src/SmartSql/SmartSqlMapper.cs

@@ -54,10 +54,7 @@ public SmartSqlMapper(SmartSqlOptions options)
         private void SetupRequestContext(RequestContext context)
         {
             context.Setup(SmartSqlOptions.SmartSqlContext);
-            if (context.CommandType == CommandType.Text)
-            {
-                SqlBuilder.BuildSql(context);
-            }
+            SqlBuilder.BuildSql(context);
         }
         private void SetWriteSourceIfUnknow(RequestContext context)
         {