support explicitly set scale of zero for datetime2, datetimeoffset and time

EamonHetherton · EamonHetherton · commit 0e03843576f0 · 2021-11-08T16:31:17.000+10:00
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;
             }

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ internal byte ScaleInternal`
`577`	`577`	`}`
`578`	`578`	`}`
`579`	`579`
`580`		`- private bool ShouldSerializeScale() => _scale != 0; // V1.0 compat, ignore _hasScale`
	`580`	`+ private bool ShouldSerializeScale() => _scale != 0 \|\| (GetMetaTypeOnly().IsVarTime && HasFlag(SqlParameterFlags.HasScale));`
`581`	`581`
`582`	`582`	`/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml' path='docs/members[@name="SqlParameter"]/SqlDbType/*' />`
`583`	`583`	`[`
`@@ -1445,8 +1445,7 @@ internal byte GetActualScale()`
`1445`	`1445`	`return ScaleInternal;`
`1446`	`1446`	`}`
`1447`	`1447`
`1448`		`- // issue: how could a user specify 0 as the actual scale?`
`1449`		`- if (GetMetaTypeOnly().IsVarTime)`
	`1448`	`+ if (GetMetaTypeOnly().IsVarTime && !HasFlag(SqlParameterFlags.HasScale))`
`1450`	`1449`	`{`
`1451`	`1450`	`return TdsEnums.DEFAULT_VARTIME_SCALE;`
`1452`	`1451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ internal byte ScaleInternal`
`560`	`560`	`}`
`561`	`561`	`}`
`562`	`562`
`563`		`- private bool ShouldSerializeScale() => _scale != 0; // V1.0 compat, ignore _hasScale`
	`563`	`+ private bool ShouldSerializeScale() => _scale != 0 \|\| (GetMetaTypeOnly().IsVarTime && HasFlag(SqlParameterFlags.HasScale));`
`564`	`564`
`565`	`565`	`/// <include file='../../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlParameter.xml' path='docs/members[@name="SqlParameter"]/SqlDbType/*' />`
`566`	`566`	`[`
`@@ -1437,8 +1437,7 @@ internal byte GetActualScale()`
`1437`	`1437`	`return ScaleInternal;`
`1438`	`1438`	`}`
`1439`	`1439`
`1440`		`- // issue: how could a user specify 0 as the actual scale?`
`1441`		`- if (GetMetaTypeOnly().IsVarTime)`
	`1440`	`+ if (GetMetaTypeOnly().IsVarTime && !HasFlag(SqlParameterFlags.HasScale))`
`1442`	`1441`	`{`
`1443`	`1442`	`return TdsEnums.DEFAULT_VARTIME_SCALE;`
`1444`	`1443`	`}`