Merge pull request #195 from ngvtien/master

Fix command reuse scenario

Author: formicas

build/common.props

@@ -1,15 +1,15 @@
 <Project>
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;net46;netstandard2.0</TargetFrameworks>
-    <VersionPrefix>0.19.0</VersionPrefix>
+    <VersionPrefix>0.19.1</VersionPrefix>
     <AssemblyVersion>0.11.0.0</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <Authors>dataaction</Authors>
     <PackageTags>Sybase ASE Adaptive SAP AseClient DbProvider</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/DataAction/AdoNetCore.AseClient</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageReleaseNotes>Refer to GitHub - https://github.com/DataAction/AdoNetCore.AseClient/releases/tag/0.19.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Refer to GitHub - https://github.com/DataAction/AdoNetCore.AseClient/releases/tag/0.19.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/DataAction/AdoNetCore.AseClient</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>

src/AdoNetCore.AseClient/Internal/FormatItem.cs

@@ -50,6 +50,7 @@ public string ParameterName
         public bool IsDecimalType => DataType == TdsDataType.TDS_DECN ||
                                      DataType == TdsDataType.TDS_NUMN;
 
+        public AseDbType AseDbType { get; set; }
         /// <summary>
         /// Relates to TDS_BLOB
         /// </summary>
@@ -73,6 +74,7 @@ public static FormatItem CreateForParameter(AseParameter parameter, DbEnvironmen
 
             var format = new FormatItem
             {
+                AseDbType = parameter.AseDbType,
                 ParameterName = parameter.ParameterName,
                 IsOutput = parameter.IsOutput,
                 IsNullable = parameter.IsNullable,

src/AdoNetCore.AseClient/Internal/InternalConnection.cs

@@ -670,7 +670,7 @@ private IToken[] BuildParameterTokens(AseCommand command)
             foreach (var parameter in command.Parameters.SendableParameters)
             {
                 var parameterName = parameter.ParameterName ?? command.Parameters.IndexOf(parameter).ToString();
-                if (command.FormatItem == null || command.FormatItem.ParameterName != parameterName)
+                if (!(command.FormatItem != null && command.FormatItem.ParameterName == parameterName && command.FormatItem.AseDbType == parameter.AseDbType))
                 {
                     command.FormatItem = FormatItem.CreateForParameter(parameter, _environment, command.CommandType);
                 }

test/AdoNetCore.AseClient.Tests/Integration/AseCommandTests.cs

@@ -134,6 +134,50 @@ public void GetDataTypeName_ShouldWorkUtf8(string input, string expectedName)
             }
         }
 
+        [Test]
+        public void Command_Reuse_ShouldWork()
+        {
+            using (var connection = GetConnection())
+            {
+                connection.Open();
+                using (var cmd = connection.CreateCommand())
+                {
+                    {
+                        var sql = @"SELECT TOP 1 Convert(Decimal(29,10), @value)";
+                        var p = cmd.CreateParameter();
+                        p.ParameterName = "@value";
+                        p.DbType = System.Data.DbType.Decimal;
+                        p.Value = 6579.64648m;
+                        cmd.CommandText = sql;
+                        cmd.Parameters.Add(p);
+
+                        // 6579.64648m sent to server
+                        using (var rd = cmd.ExecuteReader(System.Data.CommandBehavior.Default))
+                        {
+                            rd.Read();
+                            var result = rd.GetDecimal(0);
+                            Assert.AreEqual(6579.64648M, result);
+                        }
+
+                        p = cmd.CreateParameter();
+                        p.ParameterName = "@value";
+                        p.DbType = System.Data.DbType.Single;
+                        p.Value = 6579.64648f;
+                        cmd.Parameters.Clear();
+                        cmd.Parameters.Add(p);
+
+                        // decimal formatter applied to 6579.64648f and returned value is 65.79....
+                        using (var rd = cmd.ExecuteReader(System.Data.CommandBehavior.Default))
+                        {
+                            rd.Read();
+                            var result = rd.GetDecimal(0);
+                            Assert.AreEqual(6579.646484375M, result);
+                        }
+                    }
+                }
+            }
+        }
+
         private static IEnumerable<TestCaseData> GetDataTypeName_ShouldWork_Cases()
         {
             yield return new TestCaseData("convert(unichar(2), 'À')", "unichar");