BugFix: Scalar result parser now handles nullable primitives

nref-dan · nref-dan · commit bea8467e544a · 2018-11-08T14:45:39.000Z
diff --git a/src/OpenPerpetuum.Core.DataServices/Database/ResultSet.cs b/src/OpenPerpetuum.Core.DataServices/Database/ResultSet.cs
@@ -71,9 +71,12 @@ public void AddData(int rowNumber, DataRowObject dataRow)
 
 		private TResultObject ParseScalarResult(object value)
 		{
-			TResultObject resultObject = (TResultObject)Convert.ChangeType(value, typeof(TResultObject));
+			object tempVal = value == DBNull.Value ? null : value;
+			Type resultType = Nullable.GetUnderlyingType(typeof(TResultObject)) ?? typeof(TResultObject);
 
-			return resultObject;
+			object safeObject = (tempVal == null) ? null : Convert.ChangeType(tempVal, resultType);
+
+			return (TResultObject)safeObject;
 		}
 
 		private TResultObject ParseObjectResult<TDataObject>(DataRowObject dataRow)

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,12 @@ public void AddData(int rowNumber, DataRowObject dataRow)`
`71`	`71`
`72`	`72`	`private TResultObject ParseScalarResult(object value)`
`73`	`73`	`{`
`74`		`- TResultObject resultObject = (TResultObject)Convert.ChangeType(value, typeof(TResultObject));`
	`74`	`+ object tempVal = value == DBNull.Value ? null : value;`
	`75`	`+ Type resultType = Nullable.GetUnderlyingType(typeof(TResultObject)) ?? typeof(TResultObject);`
`75`	`76`
`76`		`- return resultObject;`
	`77`	`+ object safeObject = (tempVal == null) ? null : Convert.ChangeType(tempVal, resultType);`
	`78`	`+`
	`79`	`+ return (TResultObject)safeObject;`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`private TResultObject ParseObjectResult<TDataObject>(DataRowObject dataRow)`