Allow conversions from decimal to double or float. Fixes #664

bgrainger · bgrainger · commit da97b4d337d6 · 2019-09-05T22:22:21.000-07:00
diff --git a/src/MySqlConnector/Core/Row.cs b/src/MySqlConnector/Core/Row.cs
@@ -299,10 +299,17 @@ public Stream GetStream(int ordinal)
 		public double GetDouble(int ordinal)
 		{
 			var value = GetValue(ordinal);
-			return value is float floatValue ? floatValue : (double) value;
+			return value is float floatValue ? floatValue :
+				value is decimal decimalValue ? (double) decimalValue :
+				(double) value;
 		}
 
-		public float GetFloat(int ordinal) => (float) GetValue(ordinal);
+		public float GetFloat(int ordinal)
+		{
+			var value = GetValue(ordinal);
+			return value is decimal decimalValue ? (float) decimalValue :
+				(float) value;
+		}
 
 		public MySqlDateTime GetMySqlDateTime(int ordinal)
 		{
diff --git a/tests/Conformance.Tests/Conformance.Tests.csproj b/tests/Conformance.Tests/Conformance.Tests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
  <ItemGroup>
-    <PackageReference Include="AdoNet.Specification.Tests" Version="2.0.0-alpha4" />
+    <PackageReference Include="AdoNet.Specification.Tests" Version="2.0.0-alpha5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

Original file line number	Diff line number	Diff line change
`@@ -299,10 +299,17 @@ public Stream GetStream(int ordinal)`
`299`	`299`	`public double GetDouble(int ordinal)`
`300`	`300`	`{`
`301`	`301`	`var value = GetValue(ordinal);`
`302`		`- return value is float floatValue ? floatValue : (double) value;`
	`302`	`+ return value is float floatValue ? floatValue :`
	`303`	`+ value is decimal decimalValue ? (double) decimalValue :`
	`304`	`+ (double) value;`
`303`	`305`	`}`
`304`	`306`
`305`		`- public float GetFloat(int ordinal) => (float) GetValue(ordinal);`
	`307`	`+ public float GetFloat(int ordinal)`
	`308`	`+ {`
	`309`	`+ var value = GetValue(ordinal);`
	`310`	`+ return value is decimal decimalValue ? (float) decimalValue :`
	`311`	`+ (float) value;`
	`312`	`+ }`
`306`	`313`
`307`	`314`	`public MySqlDateTime GetMySqlDateTime(int ordinal)`
`308`	`315`	`{`