support explicitly set scale of zero for datetime2, datetimeoffset an…

…d time
dotnet · Nov 8, 2021 · 0e03843 · 0e03843
1 parent 78e8ebc
commit 0e03843
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlParameter.cs
@@ -577,7 +577,7 @@ internal byte ScaleInternal
             }
         }
 
-        private bool ShouldSerializeScale() => _scale != 0; // V1.0 compat, ignore _hasScale
+        private bool ShouldSerializeScale() => _scale != 0 || (GetMetaTypeOnly().IsVarTime && HasFlag(SqlParameterFlags.HasScale));
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml' path='docs/members[@name="SqlParameter"]/SqlDbType/*' />
         [
@@ -1445,8 +1445,7 @@ internal byte GetActualScale()
                 return ScaleInternal;
             }
 
-            // issue: how could a user specify 0 as the actual scale?
-            if (GetMetaTypeOnly().IsVarTime)
+            if (GetMetaTypeOnly().IsVarTime && !HasFlag(SqlParameterFlags.HasScale))
             {
                 return TdsEnums.DEFAULT_VARTIME_SCALE;
             }

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlParameter.cs
@@ -560,7 +560,7 @@ internal byte ScaleInternal
             }
         }
 
-        private bool ShouldSerializeScale() => _scale != 0; // V1.0 compat, ignore _hasScale
+        private bool ShouldSerializeScale() => _scale != 0 || (GetMetaTypeOnly().IsVarTime && HasFlag(SqlParameterFlags.HasScale));
 
         /// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml' path='docs/members[@name="SqlParameter"]/SqlDbType/*' />
         [
@@ -1437,8 +1437,7 @@ internal byte GetActualScale()
                 return ScaleInternal;
             }
 
-            // issue: how could a user specify 0 as the actual scale?
-            if (GetMetaTypeOnly().IsVarTime)
+            if (GetMetaTypeOnly().IsVarTime && !HasFlag(SqlParameterFlags.HasScale))
             {
                 return TdsEnums.DEFAULT_VARTIME_SCALE;
             }